Merge branch 'upstream-fixes' into for-linus
commit9929ffed889b4861b52ba648a44fa4add945c4d1
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:27:54 +0000 (4 15:27 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:27:54 +0000 (4 15:27 +0200)
tree3cca02ae6b6616cc9a204b762aab349fcfa3aefe
parentfc73697bd5bf4efe8b5b2b78ec09e00f967cd055
parentd5e0a06f17a0ffb0eb08a5bd7b18f00af70d9a12
Merge branch 'upstream-fixes' into for-linus

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