tree 032289d5b7d87976675c1a1a32d512a44d234fa2
parent e17ba73b0ee6c0f24393c48b455e0d8db761782c
parent 6329d3021bcfa9038621e6e917d98929421d8ec8
author Ingo Molnar <mingo@elte.hu> 1215670634 +0200
committer Ingo Molnar <mingo@elte.hu> 1215670634 +0200

Merge branch 'linus' into core/printk

Conflicts:

	kernel/printk.c

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