Merge branch 'kbuild/kconfig' into kbuild/for-next

author Michal Marek <mmarek@suse.com>

Wed, 19 Aug 2015 15:42:02 +0000 (17:42 +0200)

committer Michal Marek <mmarek@suse.com>

Wed, 19 Aug 2015 15:42:02 +0000 (17:42 +0200)
author Michal Marek <mmarek@suse.com>
Wed, 19 Aug 2015 15:42:02 +0000 (17:42 +0200)
committer Michal Marek <mmarek@suse.com>
Wed, 19 Aug 2015 15:42:02 +0000 (17:42 +0200)
diff --cc Makefile
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
diff --cc scripts/tags.sh
Simple merge
author	Michal Marek <mmarek@suse.com>
	Wed, 19 Aug 2015 15:42:02 +0000 (17:42 +0200)
committer	Michal Marek <mmarek@suse.com>
	Wed, 19 Aug 2015 15:42:02 +0000 (17:42 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/tags.sh	patch \|	diff1 \|	diff2 \|	blob \| history