Merge branch 'linus' into core/debug
authorIngo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 07:09:51 +0000 (09:09 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 07:09:51 +0000 (09:09 +0200)
Conflicts:
lib/vsprintf.c

Manual merge:

include/linux/kernel.h

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

Trivial merge