| commit | 7a222156bcf010dbf77fe7d803c375bcc4a51160 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 06 15:02:00 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 06 15:02:00 2012 -0800 |
| tree | 2689bf892bd9de873ac3887fbd6ff59bb811da38 | |
| parent | 2c364faabb8ef400e4632bb989287bcd7c0a9148 [diff] | |
| parent | cf833d0b9937874b50ef2867c4e8badfd64948ce [diff] |
Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip * 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: random: Use arch_get_random_int instead of cycle counter if avail