Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commitf38bb7de289f5c15e287386d35e9c325f1062c49
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2008 08:26:59 +0000 (4 10:26 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2008 08:26:59 +0000 (4 10:26 +0200)
tree38e69a9ecea18243e3f66bcf51bc89cd7b8f0c94
parent2d4b3f37ded8998a362c8d0b4be02f583dd9a002
parentc3b25b32e8bef526cca748e1ba023c6bdd705a99
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/hid/usbhid/hid-quirks.c