Merge branch 'smack-for-3.11' of git://git.gitorious.org/smack-next/kernel into ra...
authorJames Morris <james.l.morris@oracle.com>
Tue, 11 Jun 2013 04:13:31 +0000 (14:13 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 11 Jun 2013 04:13:31 +0000 (14:13 +1000)

Trivial merge