From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Sep 2012 01:48:11 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20120918~77
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=50d8c965e33c1a62451c98eb243ff36c4d99dbe5;p=karo-tx-linux.git

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

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

50d8c965e33c1a62451c98eb243ff36c4d99dbe5