| commit | 50b719f811583a47762ecb7e480d253abc2eb22f | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Wed Oct 30 14:07:10 2013 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Wed Oct 30 14:07:10 2013 +1100 |
| tree | 290e6cb4f15695140a9dbef1164e69ac9c80e454 | |
| parent | 3ea7a56067e663278470c04fd655adf809e72d4d [diff] | |
| parent | b5dfd8075bc26636d11c3d8888940198afbf5112 [diff] |
Merge branch 'smack-for-3.13' of git://git.gitorious.org/smack-next/kernel into ra-next