Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel...
authorJames Morris <james.l.morris@oracle.com>
Thu, 29 Jan 2015 00:01:07 +0000 (11:01 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 29 Jan 2015 00:01:07 +0000 (11:01 +1100)

Trivial merge