| commit | 8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6 | [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 | be62fbf376261ab3a4ed5db3bf54d5df9e216d9f [diff] | |
| parent | be71a179bdd935336fb0bee8283be729144ac965 [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