From: James Morris Date: Wed, 3 Jun 2015 09:10:29 +0000 (+1000) Subject: Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next... X-Git-Tag: firefly_0821_release~176^2~1534^2~12 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e6e29a4eae335059d2cc44ac543de7556ff7ac09;p=firefly-linux-kernel-4.4.55.git Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next --- e6e29a4eae335059d2cc44ac543de7556ff7ac09