| commit | 7c368bb1049bde17fc4f8655492478d7f2918da9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Mar 06 17:34:28 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Mar 06 17:34:28 2007 -0800 |
| tree | 4cf42cdfd0f7bccda990d94b4f00aa3beebc186f | |
| parent | cba5a641ca7887dc371486681dac887869d1c7b7 [diff] | |
| parent | 5ddc3229488f4cad719f47aecfa1459ebbbde5b3 [diff] |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: HID blacklisting of all Code Mercenaries IOWarrior devices