projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe8a0df 9c69898)
Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJames Morris <jmorris@namei.org>
Fri, 18 Nov 2011 00:17:23 +0000 (11:17 +1100)
committerJames Morris <jmorris@namei.org>
Fri, 18 Nov 2011 00:17:23 +0000 (11:17 +1100)

Trivial merge