Merge remote-tracking branch 'arm-soc/for-next'

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

Wed, 21 May 2014 00:01:00 +0000 (10:01 +1000)

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

Wed, 21 May 2014 00:01:00 +0000 (10:01 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:01:00 +0000 (10:01 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:01:00 +0000 (10:01 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/input/touchscreen/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 May 2014 00:01:00 +0000 (10:01 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 May 2014 00:01:00 +0000 (10:01 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history