projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 459c15e 41a2d57)
Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 11 Aug 2015 01:18:53 +0000 (11:18 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 11 Aug 2015 01:18:53 +0000 (11:18 +1000)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.