]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7546928 11b1d7b)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2016 01:15:40 +0000 (18:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2016 01:15:40 +0000 (18:15 -0700)
commitae6ad99366fe13f55ac43782c769dc802bdea825
tree3d1acc687a810aaa51cdc08b4d20d8de888eec6atree | snapshot
parent7546928841b44d61203658e67021ae5eca01b316commit | diff
parent11b1d7b77e29b42d53a2cf3796ff1526fda114abcommit | diff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes an NFS regression caused by the skcipher/hash conversion in
  sunrpc.  It also fixes a build problem in certain configurations with
  bcm63xx"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: bcm63xx - fix device tree compilation
  sunrpc: Fix skcipher/shash conversion
net/sunrpc/auth_gss/gss_krb5_crypto.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.