Merge branches 'upstream', 'upstream-fixes' and 'debugfs' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sun, 13 Sep 2009 18:09:41 +0000 (20:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sun, 13 Sep 2009 18:09:41 +0000 (20:09 +0200)
commit8123e8f7c89a07cb22279b15bf47cdee0205d4a1
tree1b6fe7bd51279d7711bb5d856bbd5f6caddd1afb
parentaffbb8c6e690be2196258e65f3cc92d55b18d9fa
parent42960a13001aa6df52ca9952ce996f94a744ea65
parenta809dda0369ae6157f7bcd3e704b857d43704cbd
Merge branches 'upstream', 'upstream-fixes' and 'debugfs' into for-linus
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-debug.c
drivers/hid/usbhid/hid-core.c
include/linux/hid.h