diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 15:29:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 15:29:38 -0700 |
| commit | d1126ad907ce197ff45fbc2369fbeaf8ae6f75a8 (patch) | |
| tree | 59204d2c9d41f6d43119ff0750077dcc2223929e /fs/nfsd | |
| parent | 2a554736f0d518b7c4d9939c6a6842bffebc7475 (diff) | |
| parent | 83e4491818040ae6b2d9fc60434616304a101d39 (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:
USB HID: Add ID for eGalax Multitouch used in JooJoo tablet
HID: hiddev: fix memory corruption due to invalid intfdata
HID: hiddev: protect against disconnect/NULL-dereference race
HID: picolcd: correct ordering of framebuffer freeing
HID: picolcd: testing the wrong variable
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions