From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 May 2013 04:01:48 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20130527~60
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=396ffbba8a0d7b7cd7a4034145d24b402d7e97d7;p=karo-tx-linux.git

Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
	drivers/acpi/processor_driver.c
	drivers/base/power/qos.c
---

396ffbba8a0d7b7cd7a4034145d24b402d7e97d7