diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-31 12:19:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-31 12:19:30 -0800 |
| commit | 6b8c982d415f1fd0740b52cd42c80dbbfccdbf60 (patch) | |
| tree | 669838e398c9eb7bc7fdcc61cd64e70fa3a85b59 /drivers/mtd/devices | |
| parent | 03bdeda62497f49fc409883a2aa513cf075c86e2 (diff) | |
| parent | 28a2a2e1aedbe2d8b2301e6e0e4e63f6e4177aca (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"A fix for a panic in gpio-keys driver when set up with absolute
events, a fixup to the new zforce driver and a new keycode definition"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: allocate absinfo data when setting ABS capability
Input: define KEY_WWAN for Wireless WAN
Input: zforce - fix possible driver hang during suspend
Diffstat (limited to 'drivers/mtd/devices')
0 files changed, 0 insertions, 0 deletions