projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 48418bb 4c63f83)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jul 2014 17:01:34 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jul 2014 17:01:34 +0000 (10:01 -0700)
commit5196626dae54fdb5bee89fdd1232b2e03cc60956
tree1f831f5559bf70693e545447c724283330bd6156tree | snapshot
parent48418bb6e33f6b7f9a306a68414c0f72a2da9181commit | diff
parent4c63f83c2c2e16a13ce274ee678e28246bd33645commit | diff
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
John Crispins staging tree