Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2012 23:02:00 +0000 (15:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2012 23:02:00 +0000 (15:02 -0800)
commit7a222156bcf010dbf77fe7d803c375bcc4a51160
tree2689bf892bd9de873ac3887fbd6ff59bb811da38
parent2c364faabb8ef400e4632bb989287bcd7c0a9148
parentcf833d0b9937874b50ef2867c4e8badfd64948ce
Merge branch 'x86-rdrand-for-linus' of git://git./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