projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fc2b4b 5430209)
Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next...
authorJames Morris <james.l.morris@oracle.com>
Fri, 12 Jun 2015 23:51:16 +0000 (09:51 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 12 Jun 2015 23:51:16 +0000 (09:51 +1000)

Trivial merge