Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 18 Sep 2014 13:52:46 +0000 (23:52 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 18 Sep 2014 13:52:46 +0000 (23:52 +1000)

Trivial merge