Merge branch 'linus' into core/printk
authorIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 22:34:14 +0000 (23:34 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 22:34:14 +0000 (23:34 +0100)
1  2 
include/linux/kernel.h
lib/Kconfig

Simple merge
diff --cc lib/Kconfig
Simple merge