Merge branch 'linus' into locking-for-linus

author Ingo Molnar <[email protected]>

Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)

committer Ingo Molnar <[email protected]>

Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)
author Ingo Molnar <[email protected]>
Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)
committer Ingo Molnar <[email protected]>
Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)
diff --cc kernel/lockdep.c
Simple merge
diff --cc kernel/softirq.c
Simple merge
author	Ingo Molnar <[email protected]>
	Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)
committer	Ingo Molnar <[email protected]>
	Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)
		1	2
kernel/lockdep.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	patch \|	diff1 \|	diff2 \|	blob \| history