]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'x86/rdrand' into auto-latest
authorIngo Molnar <mingo@elte.hu>
Tue, 9 Aug 2011 09:55:01 +0000 (11:55 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 9 Aug 2011 09:55:01 +0000 (11:55 +0200)
commit4977f9bf2d9b511d36199ab3451a2592d6bc3793
tree398afc900c751879cbd8b6d8f578ab71db41ec6e
parent54c6475a02d5853241a449737a0f88d969a5306a
parent49d859d78c5aeb998b6936fcb5f288f78d713489
Merge branch 'x86/rdrand' into auto-latest

Conflicts:
drivers/char/random.c
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/kernel/cpu/common.c
drivers/char/random.c
include/linux/random.h