]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cae826 b147d93)
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
authorPaul Mackerras <paulus@samba.org>
Wed, 17 Oct 2007 12:31:13 +0000 (22:31 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 17 Oct 2007 12:31:13 +0000 (22:31 +1000)
1  2 
arch/powerpc/Kconfig patch | diff1 | diff2 | blob | history
arch/powerpc/platforms/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/powerpc/platforms/Kconfig
Simple merge
Linux 2.6 source tree