projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d820ac4 15f7176)
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)
Conflicts:
lib/Kconfig.debug

1  2 
kernel/lockdep.c patch | diff1 | diff2 | blob | history
kernel/softirq.c patch | diff1 | diff2 | blob | history

diff --cc kernel/lockdep.c
Simple merge
diff --cc kernel/softirq.c
Simple merge
Domain: System / Kernel;