Conflicts: drivers/spi/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| atmel_dataflash_spi.c | ||
| atmel_spi.c | ||
| atmel_spi.h | ||
| bfin_spi.c | ||
| kirkwood_spi.c | ||
| mpc8xxx_spi.c | ||
| mpc52xx_spi.c | ||
| mxc_spi.c | ||
| soft_spi.c | ||
Conflicts: drivers/spi/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| atmel_dataflash_spi.c | ||
| atmel_spi.c | ||
| atmel_spi.h | ||
| bfin_spi.c | ||
| kirkwood_spi.c | ||
| mpc8xxx_spi.c | ||
| mpc52xx_spi.c | ||
| mxc_spi.c | ||
| soft_spi.c | ||