From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 23:48:30 +0000 (+1100)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20121008~52
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f055c6557229ae792faa50885a5adb14ad175c0;p=karo-tx-linux.git

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

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

8f055c6557229ae792faa50885a5adb14ad175c0