projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1018bc2 18779b7)
Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 2 Apr 2015 00:03:58 +0000 (11:03 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 2 Apr 2015 00:03:58 +0000 (11:03 +1100)

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