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

author Michal Marek <mmarek@suse.cz>

Wed, 30 Jul 2014 20:56:54 +0000 (22:56 +0200)

committer Michal Marek <mmarek@suse.cz>

Wed, 30 Jul 2014 20:56:54 +0000 (22:56 +0200)
author Michal Marek <mmarek@suse.cz>
Wed, 30 Jul 2014 20:56:54 +0000 (22:56 +0200)
committer Michal Marek <mmarek@suse.cz>
Wed, 30 Jul 2014 20:56:54 +0000 (22:56 +0200)
diff --cc Makefile
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
author	Michal Marek <mmarek@suse.cz>
	Wed, 30 Jul 2014 20:56:54 +0000 (22:56 +0200)
committer	Michal Marek <mmarek@suse.cz>
	Wed, 30 Jul 2014 20:56:54 +0000 (22:56 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history