-
由 Sascha Hauer 提交于
Conflicts: arch/arm/mach-imx/mach-mx31_3ds.c arch/arm/mach-imx/mach-scb9328.c Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>e59a7943
Conflicts:
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-scb9328.c
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>