diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-06-13 09:51:16 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-06-13 09:51:16 +1000 |
| commit | d6f7aa27f41db6f556dba0185228a0b90a2a0980 (patch) | |
| tree | bdd9e255ba89d0def8690f383bc2b4be62ccbc80 /fs | |
| parent | 9fc2b4b436cff7d8403034676014f1be9d534942 (diff) | |
| parent | 5430209497eeb01415c681aaac0d00f65d24a526 (diff) | |
| download | linux-d6f7aa27f41db6f556dba0185228a0b90a2a0980.tar.bz2 | |
Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions