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

author Michal Marek <mmarek@suse.cz>

Tue, 25 Nov 2014 14:16:34 +0000 (15:16 +0100)

committer Michal Marek <mmarek@suse.cz>

Tue, 25 Nov 2014 14:16:34 +0000 (15:16 +0100)
author Michal Marek <mmarek@suse.cz>
Tue, 25 Nov 2014 14:16:34 +0000 (15:16 +0100)
committer Michal Marek <mmarek@suse.cz>
Tue, 25 Nov 2014 14:16:34 +0000 (15:16 +0100)
diff --cc Makefile
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/gcov/Kconfig
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
author	Michal Marek <mmarek@suse.cz>
	Tue, 25 Nov 2014 14:16:34 +0000 (15:16 +0100)
committer	Michal Marek <mmarek@suse.cz>
	Tue, 25 Nov 2014 14:16:34 +0000 (15:16 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/gcov/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history