From: James Morris <james.l.morris@oracle.com>
Date: Tue, 24 Jun 2014 08:46:07 +0000 (+1000)
Subject: Merge commit 'v3.15' into next
X-Git-Tag: v3.17-rc1~108^2~24
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f01387d2693813eb5271a3448e6a082322c7d75d;p=users%2Fwilly%2Fxarray.git

Merge commit 'v3.15' into next
---

f01387d2693813eb5271a3448e6a082322c7d75d