]> git.baikalelectronics.ru Git - uboot.git/commit
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)
commit0b94523d00fdf117d8e45fbbedfc395c876cbee4
treeb4566d2d99140d4180efc2ca9f32b2ddf3e310a8
parent33ec4468936d9662cda62cd2675e345ef48b18fb
parentd0c51ff53fca4102ea7b9cbde3aa949942d71459
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