diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:26:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:26:53 -0400 |
| commit | 65ae24b1811650f2bc5b0b85ea8b0bff6b5bf4a9 (patch) | |
| tree | 45598ae09230cb7c380997dfe61757ca3a8b9fb4 /drivers/ata/libata-sff.c | |
| parent | cb23832e3987a02428a274c8f259336f706b17e9 (diff) | |
| parent | 24c88eb671b437d700fbfa7aa79adeb9690db1eb (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: blacklist additional SoundGraph iMon LCD models
HID: fix/improve help texts for quirk drivers
HID: fix default building of HID-quirk drivers
Diffstat (limited to 'drivers/ata/libata-sff.c')
0 files changed, 0 insertions, 0 deletions