| commit | bc84c445bd177498d1cfb12b19ba93963cb90bbe | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Wed May 30 14:51:37 2018 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Wed May 30 14:51:37 2018 -0400 |
| tree | bdcd62c9e31adfed1aed06c0f41cb4719e2c0912 | |
| parent | 0d5b0767c32dff1ead77ace243d496a0885d0c37 [diff] | |
| parent | 9105e43a77c9d064a890ef208bbd14f4fc869c3c [diff] |
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>