Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 27 Sep 2012 01:03:40 +0000 (11:03 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 27 Sep 2012 01:03:40 +0000 (11:03 +1000)
Requested by Casey.


Trivial merge