| commit | c5ea8ed5567fbe35daf965bfc42903793919cff0 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri May 26 11:18:53 2017 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Fri May 26 11:18:53 2017 -0400 |
| tree | b4566d2d99140d4180efc2ca9f32b2ddf3e310a8 | |
| parent | 6ffb700428499094d80ae9f779e9d4affd84a0bf [diff] | |
| parent | dc24dac1b51b1c2d5065ab352073877375e89724 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-nds32 Move FTMAC100 to where it should be, alphabetically in drivers/net/Kconfig Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: drivers/net/Kconfig