Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11...

author Jiri Kosina <[email protected]>

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

committer Jiri Kosina <[email protected]>

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