projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbf9826 38416e5)
Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 20 Oct 2015 23:49:29 +0000 (10:49 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 20 Oct 2015 23:49:29 +0000 (10:49 +1100)

Trivial merge