| commit | 5196626dae54fdb5bee89fdd1232b2e03cc60956 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 31 10:01:34 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 31 10:01:34 2014 -0700 |
| tree | 1f831f5559bf70693e545447c724283330bd6156 | |
| parent | 48418bb6e33f6b7f9a306a68414c0f72a2da9181 [diff] | |
| parent | 4c63f83c2c2e16a13ce274ee678e28246bd33645 [diff] |
Merge git://git.kernel.org/pub/scm/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