From: James Morris <james.l.morris@oracle.com>
Date: Wed, 21 Jun 2017 01:30:20 +0000 (+1000)
Subject: Merge branch 'smack-for-4.13' of git://github.com/cschaufler/smack-next into next
X-Git-Tag: v4.13-rc1~161^2~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cdac74ddf28e2f07319cc89446f9dea35d22d999;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'smack-for-4.13' of git://github.com/cschaufler/smack-next into next
---

cdac74ddf28e2f07319cc89446f9dea35d22d999