projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa5b5b2
af96f0d
)
Merge branch 'smack-for-4.12' of git://github.com/cschaufler/smack-next into next
author
James Morris
<james.l.morris@oracle.com>
Tue, 18 Apr 2017 22:35:01 +0000
(08:35 +1000)
committer
James Morris
<james.l.morris@oracle.com>
Tue, 18 Apr 2017 22:35:01 +0000
(08:35 +1000)
Trivial merge