From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 27 Aug 2013 05:03:30 +0000 (+1000)
Subject: Merge branch 'merge' into next
X-Git-Tag: v3.12-rc1~123^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f1f4311881b330a7b5429dd101e676df191b159;p=pandora-kernel.git

Merge branch 'merge' into next

Merge stuff that already went into Linus via "merge" which
are pre-reqs for subsequent patches
---

3f1f4311881b330a7b5429dd101e676df191b159
Reading git-diff-tree failed