e59a7943f2
Conflicts: arch/arm/mach-imx/mach-mx31_3ds.c arch/arm/mach-imx/mach-scb9328.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> |
||
---|---|---|
.. | ||
amba-duart.c | ||
Kconfig | ||
Makefile | ||
platform-auart.c | ||
platform-dma.c | ||
platform-fec.c | ||
platform-flexcan.c | ||
platform-gpio-mxs.c | ||
platform-mxs-i2c.c | ||
platform-mxs-mmc.c | ||
platform-mxs-pwm.c | ||
platform-mxsfb.c |