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

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

Fri, 30 May 2014 01:12:04 +0000 (11:12 +1000)

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

Fri, 30 May 2014 01:12:04 +0000 (11:12 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:12:04 +0000 (11:12 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:12:04 +0000 (11:12 +1000)
diff --cc Makefile
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 01:12:04 +0000 (11:12 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 01:12:04 +0000 (11:12 +1000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history