diff options
author | James Morris <james.l.morris@oracle.com> | 2014-05-20 14:50:09 +1000 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-05-20 14:50:09 +1000 |
commit | 2fd4e6698f0863f47558e63b67c7c3a026513541 (patch) | |
tree | 4401d5b14ec8b0d76e53ab04f20cd77f2456efa5 /COPYING | |
parent | fab71a90eddaf4d5f654fdd0ea7c46315c8da4a4 (diff) | |
parent | ec554fa75ec94dcf47e52db9551755679c10235b (diff) |
Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions