From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 24 Jul 2014 23:10:02 +0000 (+0000)
Subject: Merge branch 'mvebu/soc-cpuidle' into mvebu/soc
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~122^2~8^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743;p=pandora-kernel.git

Merge branch 'mvebu/soc-cpuidle' into mvebu/soc

Conflicts:
	arch/arm/mach-mvebu/pmsu.c
---

54ef3fe6970b040e9b6d1fc7f64f8dcab5cfb743
Reading git-diff-tree failed