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: omap-for-v4.2/fixes-rc1^2~81^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6e29a4eae335059d2cc44ac543de7556ff7ac09;p=pandora-kernel.git Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next --- e6e29a4eae335059d2cc44ac543de7556ff7ac09 Reading git-diff-tree failed