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

Simple merge