From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 11 Apr 2012 04:44:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull'
X-Git-Tag: next-20120411~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=58fc946336d641f464a24b31abc5dc2f514c605d;p=karo-tx-linux.git

Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull'

Conflicts:
	arch/arm/include/asm/cpuidle.h
	arch/arm/mach-at91/cpuidle.c
	arch/arm/mach-davinci/cpuidle.c
	arch/arm/mach-shmobile/cpuidle.c
	drivers/cpuidle/cpuidle.c
	include/linux/cpuidle.h
---

58fc946336d641f464a24b31abc5dc2f514c605d