]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 25 Oct 2010 17:38:43 +0000 (19:38 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 25 Oct 2010 17:38:52 +0000 (19:38 +0200)
Merge reason: We want to queue up a dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/Kconfig
arch/x86/kernel/reboot.c
arch/x86/xen/enlighten.c

Simple merge
Simple merge
Simple merge