From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jun 2014 00:23:14 +0000 (-1000)
Subject: Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: MMI-PSA29.97-13-9~12040
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ee22beeb25a5fa7fc6daf3597a8d9265f8c9ce1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'random_for_linus' of git://git./linux/kernel/git/tytso/random

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
---

5ee22beeb25a5fa7fc6daf3597a8d9265f8c9ce1