]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'linus' into locking-for-linus
authorIngo Molnar <mingo@elte.hu>
Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 31 Mar 2009 11:53:43 +0000 (13:53 +0200)
commit7bee946358c3cb957d4aa648fc5ab3cad0b232d0
tree693061ebde2abc35ecc846e5084630d7225aaaff
parentd820ac4c2fa881079e6b689d2098adce337558ae
parent15f7176eb1cccec0a332541285ee752b935c1c85
Merge branch 'linus' into locking-for-linus

Conflicts:
lib/Kconfig.debug
kernel/lockdep.c
kernel/softirq.c