diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 11:05:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 11:05:21 -0800 |
| commit | b31a0fecd1dd01f1db406014a7c8a73983e04cc9 (patch) | |
| tree | 745a5b75742da6661e5a0e13bb50cb20025d919a /Makefile | |
| parent | 96b8936a9ed08746e47081458a5eb9e43a751e24 (diff) | |
| parent | 545f4e99dee7284ed57c79384c5c1d5ac58dcd59 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - add support for new USB Tablet PCs
Input: replace spin_lock_bh with spin_lock_irqsave in ml_ff_playback
Input: i8042 - add Compal Hel80 laptop to nomux blacklist
Input: cm109 - add keymap for ATCom AU-100 phone
Input: fix the example of an input device driver
Input: psmouse - fix incorrect validate_byte check in OLPC protocol
Input: atkbd - cancel delayed work before freeing its structure
Input: atkbd - add keymap quirk for Inventec Symphony systems
Input: i8042 - add Dell XPS M1530 to nomux list
Input: elo - fix format string in elo driver
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions