From: Linus Torvalds Date: Thu, 31 Jul 2014 17:01:34 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5196626dae54fdb5bee89fdd1232b2e03cc60956;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge git://git./linux/kernel/git/herbert/crypto-2.6 Pull crypto fix from Herbert Xu: "This adds missing SELinux labeling to AF_ALG sockets which apparently causes SELinux (or at least the SELinux people) to misbehave :)" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: af_alg - properly label AF_ALG socket --- 5196626dae54fdb5bee89fdd1232b2e03cc60956