Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 09:56:35 +0000 (18:56 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 09:56:35 +0000 (18:56 +0900)
commitb84293b23efd8c98416624866389854fd5dc0020
treef18d7f6c6f46c09306c88e5ebc7ad2d72c3f4d21
parent026d68be45a217f65f1617d08271f6838bfc07d7
parentf9c6d4987b23e0a514464bae6771933a48e4cd01
Merge tag 'random_for_linus' of git://git./linux/kernel/git/tytso/random

Pull /dev/random fix from Ted Ts'o:
 "This fixes a BUG_ON-causing regression that was introduced during the
  last merge window"

* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: fix BUG_ON caused by accounting simplification