Merge commit 'v3.15' into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 24 Jun 2014 08:46:07 +0000 (18:46 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 24 Jun 2014 08:46:07 +0000 (18:46 +1000)

Trivial merge