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)
Manual merge of:
drivers/net/fec_mpc52xx.c


Trivial merge