Merge branch 'master' of git://git.denx.de/u-boot-nds32
authorTom Rini <trini@konsulko.com>
Fri, 26 May 2017 15:18:53 +0000 (11:18 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 26 May 2017 15:18:53 +0000 (11:18 -0400)
commit8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6
treeb4566d2d99140d4180efc2ca9f32b2ddf3e310a8
parentbe62fbf376261ab3a4ed5db3bf54d5df9e216d9f
parentbe71a179bdd935336fb0bee8283be729144ac965
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
drivers/net/Kconfig