diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-30 14:51:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-30 14:51:37 -0400 |
| commit | 8ada17dde84954e36d8bc6ff62a6956686eb0ec4 (patch) | |
| tree | bdcd62c9e31adfed1aed06c0f41cb4719e2c0912 /scripts/kconfig/zconf.lex.c_shipped | |
| parent | 964d4f7211ec85b890e852d0226adba0b4f8c1c9 (diff) | |
| parent | a2569f12f0efaad2b1e0754a19f373275562f91e (diff) | |
| download | u-boot-8ada17dde84954e36d8bc6ff62a6956686eb0ec4.tar.gz u-boot-8ada17dde84954e36d8bc6ff62a6956686eb0ec4.tar.xz u-boot-8ada17dde84954e36d8bc6ff62a6956686eb0ec4.zip | |
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>
Diffstat (limited to 'scripts/kconfig/zconf.lex.c_shipped')
0 files changed, 0 insertions, 0 deletions