]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dee8055 5ce4b59)
Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
authorPaul Mackerras <paulus@samba.org>
Sun, 29 Jun 2008 23:57:05 +0000 (09:57 +1000)
committerPaul Mackerras <paulus@samba.org>
Sun, 29 Jun 2008 23:57:05 +0000 (09:57 +1000)
1  2 
arch/powerpc/boot/Makefile patch | diff1 | diff2 | blob | history
arch/powerpc/kernel/cputable.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/boot/Makefile
Simple merge
diff --cc arch/powerpc/kernel/cputable.c
Simple merge
Linux 2.6 source tree