Merge branch 'kbuild' into for-next

author Michal Marek <mmarek@suse.cz>

Sat, 22 Jan 2011 14:54:48 +0000 (14:54 +0000)

committer Michal Marek <mmarek@suse.cz>

Sat, 22 Jan 2011 14:54:48 +0000 (14:54 +0000)
author Michal Marek <mmarek@suse.cz>
Sat, 22 Jan 2011 14:54:48 +0000 (14:54 +0000)
committer Michal Marek <mmarek@suse.cz>
Sat, 22 Jan 2011 14:54:48 +0000 (14:54 +0000)
diff --cc Makefile
Simple merge
diff --cc scripts/tags.sh
Simple merge
author	Michal Marek <mmarek@suse.cz>
	Sat, 22 Jan 2011 14:54:48 +0000 (14:54 +0000)
committer	Michal Marek <mmarek@suse.cz>
	Sat, 22 Jan 2011 14:54:48 +0000 (14:54 +0000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/tags.sh	patch \|	diff1 \|	diff2 \|	blob \| history