Merge branch 'stage-for-3.10' of git://git.gitorious.org/smack-next/kernel into ra...
authorJames Morris <james.l.morris@oracle.com>
Mon, 1 Apr 2013 14:45:36 +0000 (01:45 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 1 Apr 2013 14:45:36 +0000 (01:45 +1100)

Trivial merge