git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

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	0d2188a9e8620187d176bbd96b5a45d61d208a06
tree	f5791e3147b713e02b69c528644a8a2d41b3ea7f	tree \| snapshot
parent	fbcfa6ba7f23d644953fcab83180593bc032eeaf	commit \| diff
parent	cf7f58370cafbb49a766d1b55b2a21a41c753f33	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>

Linux Kernel Source Tree.

RSS Atom

arch/arm/mach-imx/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clk-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/platsmp.c	diff1 \|	diff2 \|	blob \| history