From: James Morris Date: Thu, 2 Dec 2010 21:21:01 +0000 (+1100) Subject: Merge branch 'smack-next-master' into next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fe27d4b012273640e033be80f143bdc54daa8e16;p=linux.git Merge branch 'smack-next-master' into next --- fe27d4b012273640e033be80f143bdc54daa8e16