Merge branches 'debug-module-param' and 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 9 Jul 2007 12:23:37 +0000 (14:23 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 9 Jul 2007 12:23:37 +0000 (14:23 +0200)
commitfeb485d4010e450183bd422d90c0d0f6be98f932
tree6c6b14d67b81fe98d6bee658c0caaffefae6b789
parent58037eb961f859607b161c50d9d4ecb374de1e8f
parent2c1d8aea2ca76df1b1de2aed23e3ceda2a044ed1
Merge branches 'debug-module-param' and 'upstream' into for-linus
drivers/hid/Kconfig
drivers/hid/hid-input.c
drivers/hid/usbhid/hid-core.c
drivers/hid/usbhid/hid-quirks.c
include/linux/hid.h