summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 15:02:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 15:02:00 -0800
commit7a222156bcf010dbf77fe7d803c375bcc4a51160 (patch)
tree2689bf892bd9de873ac3887fbd6ff59bb811da38 /arch/cris
parent2c364faabb8ef400e4632bb989287bcd7c0a9148 (diff)
parentcf833d0b9937874b50ef2867c4e8badfd64948ce (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
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions