From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Oct 2012 00:16:09 +0000 (+1100)
Subject: Merge remote-tracking branch 'cpuidle/cpuidle-next'
X-Git-Tag: next-20121029~70
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c7c3c6d002d21c669854fee8125da5944fc6982;p=karo-tx-linux.git

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

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

8c7c3c6d002d21c669854fee8125da5944fc6982