Merge commit 'v3.16' into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 30 Sep 2014 14:44:04 +0000 (00:44 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 30 Sep 2014 14:44:04 +0000 (00:44 +1000)

Trivial merge