Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and serial. Conflicts: arch/arm/dts/exynos5250.dtsi Signed-off-by: Tom Rini <trini@ti.com> |
||
---|---|---|
.. | ||
Makefile | ||
ehci-armada100.c | ||
ehci-atmel.c | ||
ehci-exynos.c | ||
ehci-faraday.c | ||
ehci-fsl.c | ||
ehci-hcd.c | ||
ehci-ixp4xx.c | ||
ehci-marvell.c | ||
ehci-mpc512x.c | ||
ehci-mx5.c | ||
ehci-mx6.c | ||
ehci-mxc.c | ||
ehci-mxs.c | ||
ehci-omap.c | ||
ehci-pci.c | ||
ehci-ppc4xx.c | ||
ehci-spear.c | ||
ehci-tegra.c | ||
ehci-vct.c | ||
ehci.h | ||
isp116x-hcd.c | ||
isp116x.h | ||
ohci-at91.c | ||
ohci-da8xx.c | ||
ohci-hcd.c | ||
ohci-s3c24xx.c | ||
ohci-s3c24xx.h | ||
ohci.h | ||
r8a66597-hcd.c | ||
r8a66597.h | ||
sl811-hcd.c | ||
sl811.h | ||
utmi-armada100.c |