Merge remote-tracking branch 'kbuild/for-next'

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

Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)

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

Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)
diff --cc Makefile
Simple merge
diff --cc arch/mips/Makefile
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 02:57:03 +0000 (12:57 +1000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history