diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 10:51:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 10:51:03 -0700 |
| commit | 8b108c609adefd98577c35f0a41497a610041a6c (patch) | |
| tree | f1552fdc5bf0ebcc484a88f01cd3864113adf25c /drivers/input/sparse-keymap.c | |
| parent | 7ce1418f95e918cfc5ad36e3ec3431145c768cd0 (diff) | |
| parent | 73d5e8f77e88a4d3a154dfdbb4ed2cf461b7bf21 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (59 commits)
HID: fix up 'EMBEDDED' mess in Kconfig
HID: roccat: cleanup preprocessor macros
HID: roccat: refactor special event handling
HID: roccat: fix special button support
HID: roccat: Correctly mark init and exit functions
HID: hidraw: Use Interrupt Endpoint for OUT Transfers if Available
HID: hid-samsung: remove redundant key mappings
HID: add omitted hid-zydacron.c file
HID: hid-samsung: add support for Creative Desktop Wireless 6000
HID: picolcd: Eliminate use after free
HID: Zydacron Remote Control driver
HID: Use kmemdup
HID: magicmouse: fix input registration
HID: make Prodikeys driver standalone config option
HID: Prodikeys PC-MIDI HID Driver
HID: hidraw: fix indentation
HID: ntrig: add filtering module parameters
HID: ntrig: add sysfs access to filter parameters
HID: ntrig: add sensitivity and responsiveness support
HID: add multi-input quirk for eGalax Touchcontroller
...
Diffstat (limited to 'drivers/input/sparse-keymap.c')
0 files changed, 0 insertions, 0 deletions