Merge remote branch 'smack/smack-for-4.10' into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 22 Nov 2016 11:15:30 +0000 (22:15 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 22 Nov 2016 11:15:30 +0000 (22:15 +1100)

Trivial merge