From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Oct 2012 01:02:23 +0000 (+1100)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20121030~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83f8ba9ee29a4020980d84d8df78fff1759f5065;p=karo-tx-linux.git

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

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

83f8ba9ee29a4020980d84d8df78fff1759f5065