From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 13 Sep 2012 02:31:05 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20120913~83
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=99b8e2af9c71bc8f36623aa608f0314b6106f2cf;p=karo-tx-linux.git

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

Conflicts:
	drivers/cpuidle/coupled.c
	include/linux/cpuidle.h
---

99b8e2af9c71bc8f36623aa608f0314b6106f2cf