Skip to content
Commit 8dc1b17f authored by Tom Rini's avatar Tom Rini
Browse files

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: default avatarTom Rini <trini@konsulko.com>

Conflicts:
	drivers/net/Kconfig
parents be62fbf3 be71a179
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment