]> git.baikalelectronics.ru Git - uboot.git/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)
commitd1d2ca7ca24beef4a2ce291a82a0e37346389e9c
treebdcd62c9e31adfed1aed06c0f41cb4719e2c0912
parentc4abb0f5dc7e728ae168be03f536f36c19cbc83b
parentaba0f9cf438a128a34ff5807e2b8f3e99d246ed7
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