projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ccc7d6 c60b906)
Merge branch 'smack-for-4.9' of http://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 15 Sep 2016 04:43:46 +0000 (14:43 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 15 Sep 2016 04:43:46 +0000 (14:43 +1000)

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