Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Oct 2014 19:33:32 +0000 (12:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Oct 2014 19:33:32 +0000 (12:33 -0700)
Pull /dev/random updates from Ted Ts'o:
 "This adds a memzero_explicit() call which is guaranteed not to be
  optimized away by GCC.  This is important when we are wiping
  cryptographically sensitive material"

* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  crypto: memzero_explicit - make sure to clear out sensitive data
  random: add and use memzero_explicit() for clearing data

1  2 
crypto/sha256_generic.c
crypto/sha512_generic.c
drivers/char/random.c
include/linux/string.h
lib/string.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/string.c
Simple merge