| commit | 0d309cbddb49d4d948b3e9fe8423e80b3b64486b | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Mon Feb 16 13:47:53 2015 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Mon Feb 16 13:47:53 2015 +1100 |
| tree | 80c2de7fa46339120d458e033612a9c71625d856 | |
| parent | d0709f1e66e8066c4ac6a54620ec116aa41937c0 [diff] | |
| parent | 7f368ad34f0657f4bc39bf5bad6692b5a81a1194 [diff] |
Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into for-linus