From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 19 May 2011 07:00:06 +0000 (+1000)
Subject: Merge branch 'merge' into next
X-Git-Tag: v3.0-rc1~385^2~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4c8440666b995f20604852b35dcfdbcc1d5931f1;p=linux.git

Merge branch 'merge' into next
---

4c8440666b995f20604852b35dcfdbcc1d5931f1