From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Aug 2012 02:00:20 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20120822~66
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=185935eba446d23bc7b9171560ba8c928d8e6cee;p=karo-tx-linux.git

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

Conflicts:
	drivers/cpuidle/coupled.c
---

185935eba446d23bc7b9171560ba8c928d8e6cee