diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 18:56:35 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 18:56:35 +0900 |
| commit | b84293b23efd8c98416624866389854fd5dc0020 (patch) | |
| tree | f18d7f6c6f46c09306c88e5ebc7ad2d72c3f4d21 /drivers/ide/ide.c | |
| parent | 026d68be45a217f65f1617d08271f6838bfc07d7 (diff) | |
| parent | f9c6d4987b23e0a514464bae6771933a48e4cd01 (diff) | |
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/ide/ide.c')
0 files changed, 0 insertions, 0 deletions