Merge branch 'master' of git://git.denx.de/u-boot-spi

- Fix a conflict in drivers/spi/atcspi200_spi.c related to the riscv
  tree fixing a warning.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc drivers/spi/atcspi200_spi.c
index be424e0,6233d49..af96c6d
--- 1/drivers/spi/atcspi200_spi.c
--- 2/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@@ -229,8 -229,10 +229,10 @@@ static int __atcspi200_spi_xfer(struct 
                        __atcspi200_spi_start(ns);
                        break;
                }
-               debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %lu\n",
-                     *(uint *)data_out, data_out, *(uint *)data_in, data_in, data_len);
+               if (data_out)
 -                      debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %u\n",
++                      debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %lu\n",
+                             *(uint *)data_out, data_out, *(uint *)data_in,
+                             data_in, data_len);
                num_chunks = DIV_ROUND_UP(data_len, max_tran_len);
                din = data_in;
                dout = data_out;