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)
commit3585e96cd1049682b8a19a0b699422156e9d735b
tree4d7df3950f5de97ca3b20f46a80a46005120df8f
parent0a72ba7aff26fb6e918cee6d2bbfd289069f10ae
parent78a0d8f5d1e9c4a91ee97fc590abbf6e56803769
Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next

Requested by Casey.