Merge commit 'v3.17' into next
authorJames Morris <james.l.morris@oracle.com>
Wed, 19 Nov 2014 10:32:12 +0000 (21:32 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 19 Nov 2014 10:32:12 +0000 (21:32 +1100)

Trivial merge