diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:28 -0400 |
| commit | 50223e486cabdcf7e540e519da1f26bab3084e5d (patch) | |
| tree | c5eedda167c7ea83e342f80a9344646c7a99ba35 /drivers/media/video/stk-webcam.h | |
| parent | e258b80e691f1f3ae83a60aa80eaf7322bd55ec4 (diff) | |
| parent | a2d693cf650f000ea22351484ee66cf4c2651eef (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: 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/stk-webcam.h')
0 files changed, 0 insertions, 0 deletions