| commit | 73203361468894c3c017bfbdd9ddcbb468039604 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Fri Aug 23 02:50:12 2013 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Fri Aug 23 02:50:12 2013 +1000 |
| tree | bfda3843b96c0056ef84d0957110833bb21f2b02 | |
| parent | f8eb8a1324e81927b2c64823b2fc38386efd3fef [diff] | |
| parent | 10289b0f738e8b301969f2288c4942455f1b1e59 [diff] |
Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra-next