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

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

Sun, 1 Nov 2015 23:50:48 +0000 (10:50 +1100)

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

Sun, 1 Nov 2015 23:50:48 +0000 (10:50 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 23:50:48 +0000 (10:50 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 23:50:48 +0000 (10:50 +1100)
diff --cc Makefile
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
diff --cc scripts/kconfig/Makefile
Simple merge
diff --cc scripts/package/builddeb
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 1 Nov 2015 23:50:48 +0000 (10:50 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 1 Nov 2015 23:50:48 +0000 (10:50 +1100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/kconfig/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/package/builddeb	patch \|	diff1 \|	diff2 \|	blob \| history