]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fed2fc1 d7152fe)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/ppc64/Kconfig patch | diff1 | diff2 | blob | history
arch/ppc64/kernel/setup.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/ppc64/Kconfig
Simple merge
diff --cc arch/ppc64/kernel/setup.c
Simple merge
Linux 2.6 source tree