38a5d6736e
Conflicts: drivers/spi/pxa2xx_spi_pci.c |
||
---|---|---|
.. | ||
bindings | ||
booting-without-of.txt |
38a5d6736e
Conflicts: drivers/spi/pxa2xx_spi_pci.c |
||
---|---|---|
.. | ||
bindings | ||
booting-without-of.txt |