From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 02:24:44 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20130619~77
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9cf94180e82b2a54f42560d2fa38c2e9f1c0b57f;p=karo-tx-linux.git

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

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

9cf94180e82b2a54f42560d2fa38c2e9f1c0b57f