Merge remote-tracking branch 'input/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc drivers/input/input.c
Simple merge
diff --cc drivers/input/touchscreen/zforce_ts.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 05:26:18 +0000 (16:26 +1100)
		1	2
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/input.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/zforce_ts.c	patch \|	diff1 \|	diff2 \|	blob \| history