Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next
authorJames Morris <james.l.morris@oracle.com>
Wed, 26 Nov 2014 13:35:32 +0000 (00:35 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 26 Nov 2014 13:35:32 +0000 (00:35 +1100)

Trivial merge