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)
commit6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b
tree2087ca69776116b70a6af0daae9c10bfac1aa347
parentab7476cf76e560f0efda2a631a70aabe93009025
parentadee14b2e1557d0a8559f29681732d05a89dfc35
Merge branch 'linus' into core/debug

Conflicts:
lib/vsprintf.c

Manual merge:

include/linux/kernel.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/kernel.h
kernel/softlockup.c
lib/Kconfig.debug