commit | 12fa8a2732e6d0bb42c311f76250f7871d042df8 | [log] [tgz] |
---|---|---|
author | James Morris <james.l.morris@oracle.com> | Wed May 16 01:11:29 2012 +1000 |
committer | James Morris <james.l.morris@oracle.com> | Wed May 16 01:11:29 2012 +1000 |
tree | 87a8ec37c94d068fb100cdb962af9ba5881e23b4 | |
parent | b404aef72fdafb601c945c714164c0ee2b04c364 [diff] | |
parent | f7112e6c9abf1c70f001dcf097c1d6e218a93f5c [diff] |
Merge branch 'for-1205' of http://git.gitorious.org/smack-next/kernel into next Pull request from Casey.