From: James Morris Date: Thu, 2 Dec 2010 21:21:01 +0000 (+1100) Subject: Merge branch 'smack-next-master' into next X-Git-Tag: v2.6.38-rc1~429^2~9 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe27d4b012273640e033be80f143bdc54daa8e16;p=pandora-kernel.git Merge branch 'smack-next-master' into next --- fe27d4b012273640e033be80f143bdc54daa8e16