Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel...
authorJames Morris <james.l.morris@oracle.com>
Mon, 16 Feb 2015 02:47:53 +0000 (13:47 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 16 Feb 2015 02:47:53 +0000 (13:47 +1100)

Trivial merge