projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d60d61f bf4407f)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 May 2018 21:33:22 +0000 (16:33 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 May 2018 21:33:22 +0000 (16:33 -0500)
Pull crypto fix from Herbert Xu:
 "This fixes a potential kernel panic in the inside-secure driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: inside-secure - do not use memset on MMIO


Trivial merge
John Crispins staging tree