Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/spi/spi-tegra.c between commit 536a53a300d0 ("spi: remove
completely broken Tegra driver") from the spi-mb tree and commit
5bd276118189 ("spi: tegra: remove support of legacy DMA driver based
access") from the arm-soc tree.I removed the file and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
pgpOKVz5m3Bkd.pgp
Description: PGP signature
