| commit | 1ca00728d3c26465e514d3d2e0a9a14527cbb583 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Tue Jun 11 14:13:31 2013 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Tue Jun 11 14:13:31 2013 +1000 |
| tree | c34f565dbc24088e66f504db0796d109fd1b85ce | |
| parent | e2fa3d799b7471f00adae59ff36260ad8237929f [diff] | |
| parent | 0fcfee61d63b82c1eefb5b1a914240480f17d63f [diff] |
Merge branch 'smack-for-3.11' of git://git.gitorious.org/smack-next/kernel into ra-next