]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
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)
commit7d7a48b76012eeee25871e1d69104dec4b6d740f
treec27e3d8bb2e80ad93c7b4a5c850e1ffbc090bcd2
parente4072a9a9d186fe86293effe8828faa4be75b4a4
parent229aebb873e29726b91e076161649cf45154b0bf
Merge branch 'linus' into x86/urgent

Merge reason: We want to queue up a dependent fix.

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