Merge branch 'for-1205' of http://git.gitorious.org/smack-next/kernel into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 15 May 2012 15:11:29 +0000 (01:11 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 15 May 2012 15:11:29 +0000 (01:11 +1000)
Pull request from Casey.


Trivial merge