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
drivers/net/fs_enet/fs_enet-main.c

Simple merge
Simple merge