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)
commit636e4625adb5a53ee7f6b019fa2e68f36cf96d93
treef62ebf969f1bfeaf484276eed4f7b7169055e167
parent185c0f26c0267d5978b5c30d3a04f90cb245cd76
parent152f91d4d11a30106b9cc0b27b47e0e80b633ee8
Merge remote branch 'smack/smack-for-4.10' into next