Merge commit 'gcl/merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 18 Jun 2009 01:22:08 +0000 (11:22 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 18 Jun 2009 01:22:08 +0000 (11:22 +1000)
commitb71a107c66ad952c9d35ec046a803efc89a80556
treeeb1f77af4f14974ba40a413d7679b3a451295a3d
parent4b337c5f245b6587ba844ac7bb13c313a2912f7b
parente7c5a4f292e0d1f4ba9a3a94b2c8e8b71e35b25a
Merge commit 'gcl/merge' into next

Manual merge of:
drivers/net/fec_mpc52xx.c
drivers/net/fec_mpc52xx.c
drivers/net/fec_mpc52xx_phy.c