From: James Morris Date: Fri, 18 Nov 2011 00:17:06 +0000 (+1100) Subject: Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus X-Git-Tag: v3.2-rc3~42^2~1 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=fe8a0df46e5076429872887b467c538bc9c0c738 Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus --- fe8a0df46e5076429872887b467c538bc9c0c738