diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-12 20:12:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-12 20:12:54 -0400 |
| commit | a4f1cb9f3c42e5d278b0678ed5225d9331a8dcff (patch) | |
| tree | 96f69bddb4952e64fffe02e677e9b41c1483d88f /drivers/ata/libata-eh.c | |
| parent | bd99f5e17b317a6d342ffaf500e2a9fd632d2a22 (diff) | |
| parent | b820aabf6cb987fd03d85b0b5f599685051e0426 (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 NOGET quirk for devices from CH Products
HID: fix dropped device-specific quirks
Diffstat (limited to 'drivers/ata/libata-eh.c')
0 files changed, 0 insertions, 0 deletions