From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2013 16:22:34 +0000 (+0100)
Subject: Merge branch 'imx/cpuidle' into late/dt
X-Git-Tag: v3.9-rc1~37^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a9226a3d192c38493106dcaf5f47f291ede9ed5;p=pandora-kernel.git

Merge branch 'imx/cpuidle' into late/dt

This resolves one non-obvious merge conflict between the imx cpuidle
patches and the imx DT changes for 3.9.

Conflicts:
	arch/arm/mach-imx/mach-imx6q.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

4a9226a3d192c38493106dcaf5f47f291ede9ed5
Reading git-diff-tree failed