diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 11:51:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 11:51:43 -0700 |
| commit | cdcba02a5f64f4df20b6749a0169124e38ecb733 (patch) | |
| tree | bea066c2ddb66038a5e775708dc6e0949375f106 /drivers/edac/Makefile | |
| parent | 53387b0151260f6c3513adeca77f05ed052d6217 (diff) | |
| parent | fa157bdfe87c5ea98a80b96cb08f1ab509e21a52 (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: add quirk entry for no-name keyboard (0x13ba/0x0017)
HID: fix hid_device_id for cross compiling
HID: sync on deleted io_retry timer in usbhid driver
HID: fix oops during suspend of unbound HID devices
Diffstat (limited to 'drivers/edac/Makefile')
0 files changed, 0 insertions, 0 deletions