Merge v4.1-rc1 into kbuild/for-next

author Michal Marek <mmarek@suse.cz>

Mon, 27 Apr 2015 12:30:25 +0000 (14:30 +0200)

committer Michal Marek <mmarek@suse.cz>

Mon, 27 Apr 2015 12:30:25 +0000 (14:30 +0200)
author Michal Marek <mmarek@suse.cz>
Mon, 27 Apr 2015 12:30:25 +0000 (14:30 +0200)
committer Michal Marek <mmarek@suse.cz>
Mon, 27 Apr 2015 12:30:25 +0000 (14:30 +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
author	Michal Marek <mmarek@suse.cz>
	Mon, 27 Apr 2015 12:30:25 +0000 (14:30 +0200)
committer	Michal Marek <mmarek@suse.cz>
	Mon, 27 Apr 2015 12:30:25 +0000 (14:30 +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