From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 20 Sep 2011 03:51:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/master' into next
X-Git-Tag: v3.2-rc1~34^2~80
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22;p=pandora-kernel.git

Merge remote-tracking branch 'origin/master' into next

(Merge in order to get the PCIe mps/mrss code fixes)
---

1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22
Reading git-diff-tree failed