| commit | 9d5a5f65fcabb876cb0092901d56627bd5cbfc44 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Jan 22 13:22:23 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Jan 22 13:22:23 2015 +1100 |
| tree | 475a0e28bd239d0f766e06f6bac669dfe662a42b | |
| parent | 743410a03bbf110da8942a715cf1358344ecc281 [diff] | |
| parent | 6d1cff2a885850b78b40c34777b46cf5da5d1050 [diff] |
Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into next