Merge branch 'x86/idle' into sched/core
authorIngo Molnar <mingo@kernel.org>
Mon, 13 Jan 2014 16:37:05 +0000 (17:37 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 13 Jan 2014 16:37:05 +0000 (17:37 +0100)
commitc9c8986847d2f4fc474c10ee08afa57e7474096d
treeb4ae6347b710fed25619df7ff9ce009e74f7ada7
parent0bd3a173d711857fc9f583eb5825386cc08f3948
parent7d590cca7cd2cce4ed7c47d221d6f90566653ba8
Merge branch 'x86/idle' into sched/core

Merge these x86 specific bits - we are going to add generic bits as well.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/idle/intel_idle.c