git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec6f34e 029b183)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Jan 2015 16:55:23 +0000 (04:55 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Jan 2015 16:55:23 +0000 (04:55 +1200)
Pull input subsystem fixes from Dmitry Torokhov.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION
  Input: I8042 - add Acer Aspire 7738 to the nomux list
  Input: elantech - support new ICs types for version 4
  Input: i8042 - reset keyboard to fix Elantech touchpad detection
  MAINTAINERS: remove Dmitry Torokhov's alternate address

1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/input/serio/i8042.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/serio/i8042.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.