Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-core.c
This commit is contained in:
Jiri Kosina 2012-05-22 11:32:31 +02:00
commit 56ccd186f1
13 changed files with 307 additions and 32 deletions