Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Jiri Kosina [Tue, 6 May 2008 14:57:55 +0000 (16:57 +0200)]
1  2 
drivers/hid/usbhid/hid-quirks.c

Simple merge