| commit | ac14ae25b676d721b6bfcfb046dc53a9f7760d83 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Nov 27 00:35:32 2014 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Nov 27 00:35:32 2014 +1100 |
| tree | 71d0cd79a23bbd744effe37441be2c328399a4e6 | |
| parent | a6aacbde406eeb6f8fc218b2c6172825f5e73fcf [diff] | |
| parent | 5c1b66240b7f4abc29c618a768121d6a00f4c95a [diff] |
Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next