summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/etoms.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 16:51:28 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 16:51:28 +0200
commit50223e486cabdcf7e540e519da1f26bab3084e5d (patch)
treec5eedda167c7ea83e342f80a9344646c7a99ba35 /drivers/media/video/gspca/etoms.c
parentinput: add a driver for the Winbond WPCD376I Consumer IR hardware (diff)
parentHID: Remove duplicate Kconfig entry (diff)
downloadlinux-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/media/video/gspca/etoms.c')
0 files changed, 0 insertions, 0 deletions