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)
commitdcb571be2019ae677bc5ed64437dbc87ae1eb67f
tree1b93f9ea3568be4dcc49ffb2adc0d3ab0a02b47f
parent9156ad48338e0306e508ead5c0d9986050744475
parent96f39c1718091d63dc1c5012d566737ea0d2a20c
Merge branch 'for-2.6.25' of /linux/kernel/git/galak/powerpc into for-2.6.25
arch/powerpc/Kconfig
drivers/net/fs_enet/fs_enet-main.c