From: Russell King Date: Tue, 2 Mar 2010 23:29:32 +0000 (+0000) Subject: Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b93a4afcff7be859e30cad2a305731516057d6cf;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable Conflicts: arch/arm/Makefile --- b93a4afcff7be859e30cad2a305731516057d6cf diff --cc arch/arm/Makefile index 215a5cdd3d7f,056daf8b68a5..a99aafebdfb4 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@ -146,7 -146,7 +146,8 @@@ machine-$(CONFIG_ARCH_MX1) := mx machine-$(CONFIG_ARCH_MX2) := mx2 machine-$(CONFIG_ARCH_MX25) := mx25 machine-$(CONFIG_ARCH_MX3) := mx3 + machine-$(CONFIG_ARCH_MX5) := mx5 +machine-$(CONFIG_ARCH_MXC91231) := mxc91231 machine-$(CONFIG_ARCH_NETX) := netx machine-$(CONFIG_ARCH_NOMADIK) := nomadik machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx