Merge branch 'smack-for-3.13' of git://git.gitorious.org/smack-next/kernel into ra...
authorJames Morris <james.l.morris@oracle.com>
Wed, 30 Oct 2013 03:07:10 +0000 (14:07 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 30 Oct 2013 03:07:10 +0000 (14:07 +1100)

Trivial merge