| commit | 7803c05429c7ca4e62fc3468791b7da224866305 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 12 Nov 2010 17:52:31 +0000 (12 09:52 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 12 Nov 2010 17:52:31 +0000 (12 09:52 -0800) | ||
| tree | 9edf5f4bc9a9d2dd86b17039cc53b4985ea14b94 | treesnapshot (tar.gz zip) |
| parent | 522a99140ff4794ddd168568c583fea1c8f75397 | commitdiff |
| parent | 5fdbe44d033d059cc56c2803e6b4dbd8cb4e5e39 | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: do not pass injected events back to the originating handler
Input: pcf8574_keypad - fix error handling in pcf8574_kp_probe
Input: acecad - fix a memory leak in usb_acecad_probe error path
Input: atkbd - add 'terminal' parameter for IBM Terminal keyboards
Input: i8042 - add Sony VAIOs to MUX blacklist
kgdboc: reset input devices (keyboards) when exiting debugger
Input: export input_reset_device() for use in KGDB
Input: adp5588-keys - unify common header defines
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: do not pass injected events back to the originating handler
Input: pcf8574_keypad - fix error handling in pcf8574_kp_probe
Input: acecad - fix a memory leak in usb_acecad_probe error path
Input: atkbd - add 'terminal' parameter for IBM Terminal keyboards
Input: i8042 - add Sony VAIOs to MUX blacklist
kgdboc: reset input devices (keyboards) when exiting debugger
Input: export input_reset_device() for use in KGDB
Input: adp5588-keys - unify common header defines