From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 18 Jun 2009 01:22:08 +0000 (+1000)
Subject: Merge commit 'gcl/merge' into next
X-Git-Tag: v2.6.31-rc1~110^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b71a107c66ad952c9d35ec046a803efc89a80556;p=pandora-kernel.git

Merge commit 'gcl/merge' into next

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

b71a107c66ad952c9d35ec046a803efc89a80556
Reading git-diff-tree failed