projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4fc02f 3d04c92)
Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 14 Aug 2015 07:35:10 +0000 (17:35 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 14 Aug 2015 07:35:10 +0000 (17:35 +1000)

Trivial merge