Merge branches 'for-3.10/wiimote' and 'for-3.9/upstream-fixes' into for-linus

author Jiri Kosina <[email protected]>

Tue, 30 Apr 2013 08:19:21 +0000 (10:19 +0200)

committer Jiri Kosina <[email protected]>

Tue, 30 Apr 2013 08:19:21 +0000 (10:19 +0200)
author Jiri Kosina <[email protected]>
Tue, 30 Apr 2013 08:19:21 +0000 (10:19 +0200)
committer Jiri Kosina <[email protected]>
Tue, 30 Apr 2013 08:19:21 +0000 (10:19 +0200)
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
author	Jiri Kosina <[email protected]>
	Tue, 30 Apr 2013 08:19:21 +0000 (10:19 +0200)
committer	Jiri Kosina <[email protected]>
	Tue, 30 Apr 2013 08:19:21 +0000 (10:19 +0200)
		1	2
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history