From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 16 Oct 2012 23:48:33 +0000 (+1100)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20121017~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=234b6fa0ebee78022ab0bdbb4dae5d3ebaba8961;p=karo-tx-linux.git

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

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

234b6fa0ebee78022ab0bdbb4dae5d3ebaba8961