43872fa788
This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
include/plat | ||
dma.c | ||
Kconfig | ||
Makefile | ||
mfp.c | ||
pwm.c | ||
ssp.c |