diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 16:51:28 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 16:51:28 +0200 |
commit | 50223e486cabdcf7e540e519da1f26bab3084e5d (patch) | |
tree | c5eedda167c7ea83e342f80a9344646c7a99ba35 /drivers/video/matrox/matroxfb_DAC1064.c | |
parent | input: add a driver for the Winbond WPCD376I Consumer IR hardware (diff) | |
parent | HID: Remove duplicate Kconfig entry (diff) | |
download | linux-50223e486cabdcf7e540e519da1f26bab3084e5d.tar.xz linux-50223e486cabdcf7e540e519da1f26bab3084e5d.zip |
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: Remove duplicate Kconfig entry
HID: consolidate connect and disconnect into core code
HID: fix non-atomic allocation in hid_input_report
Diffstat (limited to 'drivers/video/matrox/matroxfb_DAC1064.c')
0 files changed, 0 insertions, 0 deletions