projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c0b1c6 47cd306)
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)
commit16382ed978cb40713684cfa0f25dc255a58d0c59
tree3d1acc687a810aaa51cdc08b4d20d8de888eec6atree | snapshot
parent4c0b1c67c6250be73cedeac935b860e09de4420fcommit | diff
parent47cd30608f3fc3dbb4fdf37300baca911e2dde34commit | diff
Merge branch 'linus' of git://git./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
John Crispins staging tree