From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 9 May 2012 00:57:57 +0000 (+1000)
Subject: Merge branch 'merge' into next
X-Git-Tag: for-linus-20120531~107^2~26
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ea4e89afedc7fc64078076eacbcffaaa742baf0d;p=linux-block.git

Merge branch 'merge' into next
---

ea4e89afedc7fc64078076eacbcffaaa742baf0d