Conflicts: board/a9m2440/a9m2440.c board/pcm043/pcm043.c drivers/nand/nand_imx.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> |
||
---|---|---|
.. | ||
nand | ||
net | ||
nor | ||
serial | ||
spi | ||
usb | ||
video | ||
Kconfig | ||
Makefile |
Conflicts: board/a9m2440/a9m2440.c board/pcm043/pcm043.c drivers/nand/nand_imx.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> |
||
---|---|---|
.. | ||
nand | ||
net | ||
nor | ||
serial | ||
spi | ||
usb | ||
video | ||
Kconfig | ||
Makefile |