Merge branch 'linus' into core/printk
commit9e4144abf8a30ae221311368bbb10690ebdb4b76
authorIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 06:17:14 +0000 (10 08:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 06:17:14 +0000 (10 08:17 +0200)
tree032289d5b7d87976675c1a1a32d512a44d234fa2
parente17ba73b0ee6c0f24393c48b455e0d8db761782c
parent6329d3021bcfa9038621e6e917d98929421d8ec8
Merge branch 'linus' into core/printk

Conflicts:

kernel/printk.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/kernel.h