]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9156ad4 96f39c1)
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
authorPaul Mackerras <paulus@samba.org>
Thu, 24 Jan 2008 04:29:14 +0000 (15:29 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 24 Jan 2008 04:29:14 +0000 (15:29 +1100)
1  2 
arch/powerpc/Kconfig patch | diff1 | diff2 | blob | history
drivers/net/fs_enet/fs_enet-main.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc drivers/net/fs_enet/fs_enet-main.c
Simple merge
Linux 2.6 source tree