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

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

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

e7183095d54f57f66d0844bf0d6f8c2c1d8ec4db