From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Aug 2012 01:09:51 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20120824~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=176efe8a50a3650da805df36917046f9f06fd2be;p=karo-tx-linux.git

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

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

176efe8a50a3650da805df36917046f9f06fd2be