From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Sep 2012 03:02:13 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20120917~80
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=669ca705fb278b13640050eec5f05fe513f96a9f;p=karo-tx-linux.git

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

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

669ca705fb278b13640050eec5f05fe513f96a9f