From: James Morris Date: Sat, 22 Oct 2011 20:23:58 +0000 (+0200) Subject: Merge branch 'master' of git://gitorious.org/smack-next/kernel into next X-Git-Tag: v3.2-rc1~190^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c45ed235abf1b0b6666417e3c394f18717976acd;p=users%2Fjedix%2Flinux-maple.git Merge branch 'master' of git://gitorious.org/smack-next/kernel into next --- c45ed235abf1b0b6666417e3c394f18717976acd