| commit | 6f98e892884c32b9273ecce1332b849bcad3b8b1 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Sep 18 23:52:46 2014 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Sep 18 23:52:46 2014 +1000 |
| tree | 400e8ae29e555753e0ec085bf452f7206eb8c159 | |
| parent | ac60ab4b4968b54fb5af20eac9dd78e36ad910c1 [diff] | |
| parent | 21c7eae21a2100a89cfb8cebaf7b770271f32c6e [diff] |
Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel into next