Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit7022b15e2a9f878fd5184586064c63352c3dd225
authorJiri Kosina <jkosina@suse.cz>
Tue, 6 May 2008 14:57:55 +0000 (6 16:57 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 6 May 2008 14:57:55 +0000 (6 16:57 +0200)
tree5365c2f5bc82ae1946636ee8d5cd5d3b7e804f1b
parentaaad2b0c757f3e6e02552cb0bdcd91a5ec0d6305
parenta15306365a16380f3bafee9e181ba01231d4acd7
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/hid/usbhid/hid-quirks.c