commit | 3585e96cd1049682b8a19a0b699422156e9d735b | [log] [tgz] |
---|---|---|
author | James Morris <james.l.morris@oracle.com> | Thu Sep 27 11:03:40 2012 +1000 |
committer | James Morris <james.l.morris@oracle.com> | Thu Sep 27 11:03:40 2012 +1000 |
tree | 4d7df3950f5de97ca3b20f46a80a46005120df8f | |
parent | 0a72ba7aff26fb6e918cee6d2bbfd289069f10ae [diff] | |
parent | 78a0d8f5d1e9c4a91ee97fc590abbf6e56803769 [diff] |
Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next Requested by Casey.