Merge branch 'linus' into core/printk
Ingo Molnar [Thu, 10 Jul 2008 06:17:14 +0000 (08:17 +0200)]
Conflicts:

kernel/printk.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
include/linux/kernel.h

Simple merge