Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:26:15 +0000 (15:26 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:26:15 +0000 (15:26 +0200)
commitfc73697bd5bf4efe8b5b2b78ec09e00f967cd055
tree326d5f84b13938a12fb27468ef73db4faf43a44e
parent1c5474a65bf15a4cb162dfff86d6d0b5a08a740c
parent8c8b01c38a70661d663175d355fdea85ca082272
Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/hid-ids.h
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h