Merge branches 'next/cleanup', 'next/spring-cleaning' and 'fixes' into for-next

author Arnd Bergmann <arnd@arndb.de>

Mon, 18 Mar 2013 16:01:34 +0000 (17:01 +0100)

committer Arnd Bergmann <arnd@arndb.de>

Mon, 18 Mar 2013 16:10:47 +0000 (17:10 +0100)
author Arnd Bergmann <arnd@arndb.de>
Mon, 18 Mar 2013 16:01:34 +0000 (17:01 +0100)
committer Arnd Bergmann <arnd@arndb.de>
Mon, 18 Mar 2013 16:10:47 +0000 (17:10 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Arnd Bergmann <arnd@arndb.de>
	Mon, 18 Mar 2013 16:01:34 +0000 (17:01 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 18 Mar 2013 16:10:47 +0000 (17:10 +0100)
		1	2	3	4
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history