From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 May 2011 02:04:12 +0000 (+1000)
Subject: Merge remote-tracking branch 'idle-test/idle-test'
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d795427761eeea08832fadba9b715d5dc2af553;p=pandora-kernel.git

Merge remote-tracking branch 'idle-test/idle-test'

Conflicts:
	arch/x86/include/asm/processor.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/process.c
---

0d795427761eeea08832fadba9b715d5dc2af553
Reading git-diff-tree failed