From: James Morris <james.l.morris@oracle.com>
Date: Tue, 15 May 2012 15:11:29 +0000 (+1000)
Subject: Merge branch 'for-1205' of http://git.gitorious.org/smack-next/kernel into next
X-Git-Tag: v3.5-rc1~161^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=12fa8a2732e6d0bb42c311f76250f7871d042df8;p=linux.git

Merge branch 'for-1205' of http://git.gitorious.org/smack-next/kernel into next

Pull request from Casey.
---

12fa8a2732e6d0bb42c311f76250f7871d042df8