Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus

author Jiri Kosina <[email protected]>

Thu, 4 Jul 2013 13:05:02 +0000 (15:05 +0200)

committer Jiri Kosina <[email protected]>

Thu, 4 Jul 2013 13:05:02 +0000 (15:05 +0200)
author Jiri Kosina <[email protected]>
Thu, 4 Jul 2013 13:05:02 +0000 (15:05 +0200)
committer Jiri Kosina <[email protected]>
Thu, 4 Jul 2013 13:05:02 +0000 (15:05 +0200)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
Simple merge
author	Jiri Kosina <[email protected]>
	Thu, 4 Jul 2013 13:05:02 +0000 (15:05 +0200)
committer	Jiri Kosina <[email protected]>
	Thu, 4 Jul 2013 13:05:02 +0000 (15:05 +0200)
		1	2	3
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/hid/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history