Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Tue, 18 Aug 2015 07:39:47 +0000 (09:39 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 18 Aug 2015 07:39:47 +0000 (09:39 +0200)
commita5dd19249607474ed680f16b4f5e8477d2b68689
tree1aeeef053773c07bc02f3aa637febc80ceb96732
parent6b7e26547fad7ace3dcb27a5babd2317fb9d1e12
parent512255a2ad2c832ca7d4de9f31245f73781922d0
Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes

Conflicts:
arch/x86/entry/entry_64_compat.S
arch/x86/math-emu/get_address.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/entry/entry_64_compat.S
arch/x86/kernel/signal.c
arch/x86/kernel/step.c
arch/x86/kvm/x86.c
arch/x86/math-emu/get_address.c
drivers/cpufreq/intel_pstate.c