git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7839c28 e5f9dec)

author	Arnd Bergmann <arnd@arndb.de>
	Tue, 19 Feb 2013 16:22:34 +0000 (17:22 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 19 Feb 2013 16:22:34 +0000 (17:22 +0100)
commit	4a9226a3d192c38493106dcaf5f47f291ede9ed5
tree	f5791e3147b713e02b69c528644a8a2d41b3ea7f	tree \| snapshot (tar.gz zip)
parent	7839c281edd9f4744be58ff0b29aabc64aabde31	commit \| diff
parent	e5f9dec8ff5ff3f6254412abed1f68d758f6616b	commit \| diff

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>