diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 18:49:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 18:49:43 +0200 |
| commit | 1bbee7d616d5fdffa6c1c86075dbffe2b3e236ea (patch) | |
| tree | d4a7fd43961d1ee97b5323bfc4d75b634d317bf0 /net/ipv4/xfrm4_state.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | HID: Add Cando touch screen 15.6-inch product id (diff) | |
| download | linux-1bbee7d616d5fdffa6c1c86075dbffe2b3e236ea.tar.xz linux-1bbee7d616d5fdffa6c1c86075dbffe2b3e236ea.zip | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Add Cando touch screen 15.6-inch product id
HID: Add MULTI_INPUT quirk for turbox/mosart touchscreen
HID: hidraw, fix a NULL pointer dereference in hidraw_write
HID: hidraw, fix a NULL pointer dereference in hidraw_ioctl
Diffstat (limited to 'net/ipv4/xfrm4_state.c')
0 files changed, 0 insertions, 0 deletions