git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 026d68b f9c6d49)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.