Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Jul 2014 06:26:46 +0000 (20:26 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Jul 2014 06:26:46 +0000 (20:26 -1000)
commitb8d2d12804f1efe205284cb4b039cfc2944caba5
tree6dd75a872a4b5ae7ed2ed381ba53d23adee67b05
parent4e106275290bdb015bc16dc48e55d78cc480e7c7
parent79a8468747c5f95ed3d5ce8376a3e82e0c5857fc
Merge tag 'random_for_linus_stable' of git://git./linux/kernel/git/tytso/random

Pull /dev/random fix from Ted Ts'o:
 "Fix a BUG splat found by trinity"

* tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: check for increase of entropy_count because of signed conversion