Merge branch 'linus' into core/printk

author Ingo Molnar <[email protected]>

Sat, 28 Mar 2009 22:34:14 +0000 (23:34 +0100)

committer Ingo Molnar <[email protected]>

Sat, 28 Mar 2009 22:34:14 +0000 (23:34 +0100)
author Ingo Molnar <[email protected]>
Sat, 28 Mar 2009 22:34:14 +0000 (23:34 +0100)
committer Ingo Molnar <[email protected]>
Sat, 28 Mar 2009 22:34:14 +0000 (23:34 +0100)
diff --cc include/linux/kernel.h
Simple merge
diff --cc lib/Kconfig
Simple merge
author	Ingo Molnar <[email protected]>
	Sat, 28 Mar 2009 22:34:14 +0000 (23:34 +0100)
committer	Ingo Molnar <[email protected]>
	Sat, 28 Mar 2009 22:34:14 +0000 (23:34 +0100)
		1	2
include/linux/kernel.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history