Skip to content
Commit 4a9226a3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 7839c281 e5f9dec8
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment