mirror of https://github.com/torvalds/linux.git
Conflicts: drivers/spi/pxa2xx_spi_pci.c |
||
|---|---|---|
| .. | ||
| fsl-spi.txt | ||
| spi-bus.txt | ||
| spi_altera.txt | ||
| spi_oc_tiny.txt | ||
Conflicts: drivers/spi/pxa2xx_spi_pci.c |
||
|---|---|---|
| .. | ||
| fsl-spi.txt | ||
| spi-bus.txt | ||
| spi_altera.txt | ||
| spi_oc_tiny.txt | ||