From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 02:49:45 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20130628~81
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee51d82b7fcaa108566444ddef1b416741014628;p=karo-tx-linux.git

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

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

ee51d82b7fcaa108566444ddef1b416741014628