summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-11 19:17:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-11 19:17:28 -0700
commitf0c032d81f58c99b63a6e57cf883e923db910928 (patch)
treee7f8f7ba2b08681ec1e7544cba1f120f601737e3 /drivers/net
parentfa9a67ef9de48de5474ea1e5a358340369e78b74 (diff)
parent53431d0a3534263168c8ee576bad1c2c3a4cd9e0 (diff)
downloadlinux-stable-f0c032d81f58c99b63a6e57cf883e923db910928.tar.gz
linux-stable-f0c032d81f58c99b63a6e57cf883e923db910928.tar.bz2
linux-stable-f0c032d81f58c99b63a6e57cf883e923db910928.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input updates from Dmitry Torokhov: "Second round of updates for the input subsystem. This introduces two brand new touchscreen drivers (Colibri and imx6ul_tsc), some small driver fixes, and we are no longer report errors from evdev_flush() as users do not really have a way of handling errors, error codes that we were returning were not on the list of errors supposed to be returned by close(), and errors were causing issues with one of older versions of systemd" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: imx_keypad - remove obsolete comment Input: touchscreen - add imx6ul_tsc driver support Input: Add touchscreen support for Colibri VF50 Input: i8042 - lower log level for "no controller" message Input: evdev - do not report errors form flush() Input: elants_i2c - extend the calibration timeout to 12 seconds Input: sparcspkr - fix module autoload for OF platform drivers Input: regulator-haptic - fix module autoload for OF platform driver Input: pwm-beeper - fix module autoload for OF platform driver Input: ab8500-ponkey - Fix module autoload for OF platform driver Input: cyttsp - remove unnecessary MODULE_ALIAS() Input: elan_i2c - add ACPI ID "ELAN1000"
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions