Merge branch 'linus' into locking-for-linus
Ingo Molnar [Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)]
Conflicts:
lib/Kconfig.debug

1  2 
kernel/lockdep.c
kernel/softirq.c

Simple merge
Simple merge