| commit | d54d27c9571245e4990bb8d020b109b92115683b | [log] [tgz] |
|---|---|---|
| author | James Morris <james.morris@microsoft.com> | Tue Mar 27 09:16:31 2018 +1100 |
| committer | James Morris <james.morris@microsoft.com> | Tue Mar 27 09:16:31 2018 +1100 |
| tree | 6268fdf2653d6296116125f0346582047889a159 | |
| parent | 5893ed18a26d1f56b97c0290b0cbbc2d49d6de28 [diff] | |
| parent | 58c442f34c77ad80941e3da85cc0738e8e21d4f3 [diff] |
Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into next-smack Pull request from Casey.