Home
last modified time | relevance | path

Searched hist:"8 dc1b17f" (Results 1 – 25 of 28) sorted by relevance

12

/openbmc/u-boot/board/renesas/salvator-x/
H A DMAINTAINERS8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dsalvator-x.c8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/drivers/gpio/
H A Dsh_pfc.c8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/arch/arm/mach-rmobile/include/mach/
H A Drcar-gen3-base.h8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dgpio.h8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Drmobile.h8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/arch/arm/mach-rmobile/
H A Dcpu_info-rcar.c8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A DMakefile8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A DKconfig.648dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dcpu_info.c8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/arch/nds32/dts/
H A Dae3xx.dts8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dag101p.dts8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/board/AndesTech/adp-ae3xx/
H A Dadp-ae3xx.c8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/drivers/net/
H A Dftmac100.c8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dravb.c8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/configs/
H A Dadp-ae3xx_defconfig8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dadp-ag101p_defconfig8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dr8a7796_salvator-x_defconfig8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dr8a7795_salvator-x_defconfig8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/include/configs/
H A Dsalvator-x.h8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dadp-ae3xx.h8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Drcar-gen3-common.h8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
H A Dadp-ag101p.h8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/board/AndesTech/adp-ag101p/
H A Dadp-ag101p.c8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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
/openbmc/u-boot/drivers/serial/
H A Dserial_sh.h8dc1b17f Fri May 26 10:18:53 CDT 2017 Tom Rini <trini@konsulko.com> 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

12