Merge remote-tracking branch 'idle-test/idle-test'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:04:12 +0000 (12:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:04:12 +0000 (12:04 +1000)
Conflicts:
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process.c


Trivial merge