projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0b057b 0e94ae1)
Merge branch 'master' of git://gitorious.org/smack-next/kernel into next
authorJames Morris <jmorris@namei.org>
Sat, 22 Oct 2011 20:23:58 +0000 (22:23 +0200)
committerJames Morris <jmorris@namei.org>
Sat, 22 Oct 2011 20:23:58 +0000 (22:23 +0200)

Trivial merge