]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfa274e 74b20da)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
authorPaul Mackerras <paulus@samba.org>
Tue, 26 Feb 2008 10:08:45 +0000 (21:08 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 26 Feb 2008 10:08:45 +0000 (21:08 +1100)
1  2 
arch/powerpc/Kconfig patch | diff1 | diff2 | blob | history
arch/powerpc/kernel/prom.c patch | diff1 | diff2 | blob | history
arch/powerpc/kernel/vdso.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/powerpc/kernel/prom.c
Simple merge
diff --cc arch/powerpc/kernel/vdso.c
Simple merge
Linux 2.6 source tree