]> Pileus Git - ~andy/linux/commitdiff
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)
Merge these x86 specific bits - we are going to add generic bits as well.

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

Simple merge