From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Sep 2012 01:08:55 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20120919~76
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a0fa71d8b0dae3db9e35a0cdf2d43915ba14e991;p=karo-tx-linux.git

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

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

a0fa71d8b0dae3db9e35a0cdf2d43915ba14e991