Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2014 00:23:14 +0000 (14:23 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2014 00:23:14 +0000 (14:23 -1000)
Pull randomness bugfix from Ted Ts'o:
 "random: fix entropy accounting bug introduced in v3.15"

* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: fix nasty entropy accounting bug

1  2 
drivers/char/random.c

Simple merge