]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Wed, 30 May 2018 18:51:37 +0000 (14:51 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 30 May 2018 18:51:37 +0000 (14:51 -0400)
commit8ada17dde84954e36d8bc6ff62a6956686eb0ec4
treebdcd62c9e31adfed1aed06c0f41cb4719e2c0912
parent964d4f7211ec85b890e852d0226adba0b4f8c1c9
parenta2569f12f0efaad2b1e0754a19f373275562f91e
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>
drivers/spi/atcspi200_spi.c