Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:32:31 +0000 (11:32 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:32:31 +0000 (11:32 +0200)
Conflicts:
drivers/hid/hid-core.c


Trivial merge