diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-13 16:10:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-13 16:10:13 -0800 |
| commit | 8866f9df4a5b91a4e514ccc76472261a644a3848 (patch) | |
| tree | 9b2eb17e5171ae7771e4c99e8fc22e432deb6951 /lib/flex_array.c | |
| parent | 04e9e5c7659ee07f0387ddb663913fadcca88d5f (diff) | |
| parent | 0e253fdb3b5739fd8514f617ec582762bcfaea48 (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:
HID: wacom: Add BTN_TOOL_FINGER for pad button reporting
HID: add device IDs for new model of Apple Wireless Keyboard
HID: fix pad button definition in hid-wacom
HID: Support 171 byte variant of Samsung USB IR receiver
HID: blacklist ET&T TC5UH touchscreen controller
Diffstat (limited to 'lib/flex_array.c')
0 files changed, 0 insertions, 0 deletions