From: James Morris Date: Fri, 12 Jun 2015 23:51:16 +0000 (+1000) Subject: Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next... X-Git-Tag: v4.2-rc1~77^2~4 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d6f7aa27f41db6f556dba0185228a0b90a2a0980;p=linux.git Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next --- d6f7aa27f41db6f556dba0185228a0b90a2a0980