From: James Morris <james.l.morris@oracle.com>
Date: Tue, 18 Apr 2017 22:35:01 +0000 (+1000)
Subject: Merge branch 'smack-for-4.12' of git://github.com/cschaufler/smack-next into next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6859e21e816d8c97a0f3af6162d5ada145e6821d;p=openwrt%2Fstaging%2Fblogic.git

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

6859e21e816d8c97a0f3af6162d5ada145e6821d