]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5cfb277 e33ba5f)
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)
commit5ee22beeb25a5fa7fc6daf3597a8d9265f8c9ce1
tree209058ef31be54ecdd8a023ed3fb531c3a939d33tree | snapshot
parent5cfb277d660b8b285fc831701e91f01ec933c7b4commit | diff
parente33ba5fa7afce1a9f159704121d4e4d110df8185commit | diff
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/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
drivers/char/random.c diff1 | diff2 | blob | history
Michael's Linux tree.