From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 14 May 2012 00:19:22 +0000 (+1000)
Subject: Merge branch 'merge' into next
X-Git-Tag: v3.5-rc1~132^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b6ee04067310a6397476f05f06e52dabd8b0bb6;p=pandora-kernel.git

Merge branch 'merge' into next

We want the irq fixes from the "merge" branch.
---

8b6ee04067310a6397476f05f06e52dabd8b0bb6
Reading git-diff-tree failed