Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-30 08:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/drivers/net
History
Simon Glass 53302bdc48 Remove some merge markers 
These two files have patch merge markers in them, within comments or
strings. Remove then, so that a search for merge markers does not show up
matches in these files.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
2016-10-23 18:33:18 -04:00
..
fm Merge git://git.denx.de/u-boot-fsl-qoriq 2016-09-26 17:10:56 -04:00
fsl-mc armv8: LS2080A: Consolidate LS2080A and LS2085A 2016-04-06 10:26:46 -07:00
ldpaa_eth drivers: net: ldpaa: Memset pools_params as "0" before use 2016-05-03 17:52:11 -05:00
phy net: mv88e61xx: Add support for fixed links 2016-10-13 12:25:18 -05:00
4xx_enet.c Various, accumulated typos collected from around the tree. 2016-10-06 20:57:40 -04:00
8390.h drivers/net : move net drivers to drivers/net 2007-11-25 18:35:17 +01:00
ag7xxx.c net: Add ag7xxx driver for Atheros MIPS 2016-05-31 09:38:11 +02:00
altera_tse.c Fix GCC format-security errors and convert sprintfs. 2016-01-14 22:11:34 -05:00
altera_tse.h net: altera_tse: add mSG-DMA support 2015-11-12 08:26:59 +08:00
armada100_fec.c net: mii: Use spatch to update miiphy_register 2016-08-15 15:26:33 -05:00
armada100_fec.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
at91_emac.c net: mii: Use spatch to update miiphy_register 2016-08-15 15:26:33 -05:00
ax88180.c Remove some merge markers 2016-10-23 18:33:18 -04:00
ax88180.h AX88180: use standard I/O accessors 2010-07-12 00:14:29 -07:00
ax88796.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ax88796.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
bcm-sf2-eth-gmac.c net: mii: Changes not made by spatch 2016-08-15 15:29:03 -05:00
bcm-sf2-eth-gmac.h arm: bcm281xx: net: Add Ethernet Driver 2014-08-30 07:46:39 -04:00
bcm-sf2-eth.c net: mii: Changes not made by spatch 2016-08-15 15:29:03 -05:00
bcm-sf2-eth.h net: mii: Changes not made by spatch 2016-08-15 15:29:03 -05:00
bfin_mac.c net: mii: Fix changes made by spatch 2016-08-15 15:29:03 -05:00
bfin_mac.h net: Fix remaining API interface breakage 2012-05-23 14:19:21 -05:00
calxedaxgmac.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
cpsw-common.c drivers: net: cpsw: add support for reading mac address from efuse 2016-05-24 11:42:03 -05:00
cpsw.c Merge git://git.denx.de/u-boot-fdt 2016-10-13 20:03:33 -04:00
cs8900.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
cs8900.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
davinci_emac.c net: davinci_emac: Restore the internal MDIO accessors return values 2016-08-22 14:21:20 -05:00
davinci_emac.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
dc2114x.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
designware.c meson: odroid-c2: enable Ethernet support through the device tree 2016-09-06 13:18:19 -04:00
designware.h net: designware: Make driver independent from DM_GPIO again 2016-07-06 10:45:00 -05:00
dm9000x.c Fix GCC format-security errors and convert sprintfs. 2016-01-14 22:11:34 -05:00
dm9000x.h dm9000 remove dead external phy support, gpio fix 2008-08-26 23:08:19 -07:00
dnet.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
dnet.h dnet: driver for Dave DNET ethernet controller 2009-02-10 00:16:27 +01:00
e1000.c net: e1000: Fix the build with driver model and SPI EEPROM 2016-08-15 13:34:45 -05:00
e1000.h net: e1000: Convert to use DM PCI API 2016-02-05 12:47:23 +08:00
e1000_spi.c net: e1000: Fix the build with driver model and SPI EEPROM 2016-08-15 13:34:45 -05:00
eepro100.c net: mii: Use spatch to update miiphy_register 2016-08-15 15:26:33 -05:00
enc28j60.c net: mii: Use spatch to update miiphy_register 2016-08-15 15:26:33 -05:00
enc28j60.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ep93xx_eth.c net: mii: Fix changes made by spatch 2016-08-15 15:29:03 -05:00
ep93xx_eth.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ethoc.c net/ethoc: implement MDIO bus and support phylib 2016-08-15 13:34:49 -05:00
fec_mxc.c treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
fec_mxc.h net: fec_mxc: Add support for mx6 solo-lite 2013-09-20 17:55:36 +02:00
fsl_mcdmafec.c net: mii: Use spatch to update miiphy_register 2016-08-15 15:26:33 -05:00
fsl_mdio.c treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
ftgmac100.c Fix GCC format-security errors and convert sprintfs. 2016-01-14 22:11:34 -05:00
ftgmac100.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ftmac100.c Fix GCC format-security errors and convert sprintfs. 2016-01-14 22:11:34 -05:00
ftmac100.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
ftmac110.c treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
ftmac110.h net: ftmac110: Update tx/rx descriptor format 2013-08-19 12:34:21 -05:00
greth.c Fix GCC format-security errors and convert sprintfs. 2016-01-14 22:11:34 -05:00
greth.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
Kconfig net: emaclite: Enable driver for MIPS 2016-09-21 14:55:14 +02:00
keystone_net.c libfdt: Sync fdt_for_each_subnode() with upstream 2016-10-13 14:10:32 -06:00
ks8851_mll.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
ks8851_mll.h net: ks8851_mll: add ethernet support 2013-06-24 19:11:14 -05:00
lan91c96.c Use correct spelling of "U-Boot" 2016-02-06 12:00:59 +01:00
lan91c96.h arm: remove lubbock board support 2014-04-18 10:42:30 -04:00
lpc32xx_eth.c treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
macb.c net, macb: fix misaligned cache operation warning 2016-10-01 20:05:14 -04:00
macb.h net: macb: add gmac multi-queue support 2015-08-11 13:27:15 -05:00
Makefile net: Add EMAC driver for H3/A83T/A64 SoCs. 2016-07-15 08:34:34 +02:00
mcffec.c net: mii: Use spatch to update miiphy_register 2016-08-15 15:26:33 -05:00
mcfmii.c net: mii: Changes not made by spatch 2016-08-15 15:29:03 -05:00
mpc5xxx_fec.c net: mii: Use spatch to update miiphy_register 2016-08-15 15:26:33 -05:00
mpc5xxx_fec.h Move MPC5xxx_FEC driver to drivers/net 2008-08-29 13:58:07 -06:00
mpc512x_fec.c net: mii: Use spatch to update miiphy_register 2016-08-15 15:26:33 -05:00
mpc512x_fec.h MPC512x: remove include/mpc512x.h 2009-06-12 20:47:16 +02:00
mvgbe.c treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
mvgbe.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
mvneta.c net: mvneta: fix typo in comment 2016-10-13 12:25:21 -05:00
mvpp2.c libfdt: Sync fdt_for_each_subnode() with upstream 2016-10-13 14:10:32 -06:00
natsemi.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
ne2000.c net: Use ARRAY_SIZE at appropriate places 2013-08-19 12:34:18 -05:00
ne2000.h NE2000: Fix regresssion introduced by e710185aae on non AX88796 2008-04-28 22:26:36 -07:00
ne2000_base.c Fix spelling of "occurred". 2016-05-02 18:37:09 -04:00
ne2000_base.h Consolidate bool type 2013-04-01 16:33:52 -04:00
netconsole.c video: Drop DEV_FLAGS_SYSTEM flag 2015-11-05 08:22:21 +01:00
ns8382x.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
pch_gbe.c net: pch_gbe: Make 64 bit safe 2016-09-21 15:04:32 +02:00
pch_gbe.h net: pch_gbe: Convert to use DM PCI API 2016-02-05 12:47:23 +08:00
pcnet.c net: pcnet: Fix init on big endian 64 bit 2016-05-31 09:38:11 +02:00
pic32_eth.c drivers: net: Add ethernet driver for Microchip PIC32. 2016-02-01 22:14:02 +01:00
pic32_eth.h drivers: net: Add ethernet driver for Microchip PIC32. 2016-02-01 22:14:02 +01:00
pic32_mdio.c drivers: net: Add ethernet driver for Microchip PIC32. 2016-02-01 22:14:02 +01:00
rtl8139.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
rtl8169.c rtl8169: fix cache misalignment message on transmit. 2016-10-13 12:25:29 -05:00
sandbox-raw.c dm: eth: Avoid blocking on packet reception 2015-07-21 17:39:40 -06:00
sandbox.c net: Fix delay in net_retry test 2016-01-07 12:18:58 -07:00
sh_eth.c treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
sh_eth.h Fix various typos, scattered over the code. 2016-05-05 21:39:26 -04:00
smc911x.c net: mii: Fix changes made by spatch 2016-08-15 15:29:03 -05:00
smc911x.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
smc91111.c arm: Remove xaeniax board 2015-09-11 17:14:43 -04:00
smc91111.h arm: Remove xaeniax board 2015-09-11 17:14:43 -04:00
sun8i_emac.c libfdt: Bring in upstream stringlist functions 2016-10-13 13:54:10 -06:00
sunxi_emac.c dm: eth: Avoid blocking on packet reception 2015-07-21 17:39:40 -06:00
tsec.c treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
tsi108_eth.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
uli526x.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
vsc7385.c treewide: replace #include <asm/errno.h> with <linux/errno.h> 2016-09-23 17:55:42 -04:00
vsc9953.c drivers: net: vsc9953: Fix bug when PVID is shown for disabled ports only 2016-04-06 08:34:44 -07:00
xilinx_axi_emac.c net: axi_emac: Report phy-node error message permanently 2016-04-04 20:28:38 +02:00
xilinx_emaclite.c treewide: replace #include <asm-generic/errno.h> with <linux/errno.h> 2016-09-23 22:25:27 -04:00
xilinx_ll_temac.c net: xilinx_ll_temac: Fix string overflow 2016-01-27 15:57:20 +01:00
xilinx_ll_temac.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_fifo.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
xilinx_ll_temac_fifo.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_mdio.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_mdio.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
xilinx_ll_temac_sdma.c net: cosmetic: Fix var naming net <-> eth drivers 2015-04-18 11:11:33 -06:00
xilinx_ll_temac_sdma.h Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
zynq_gem.c treewide: replace #include <asm-generic/errno.h> with <linux/errno.h> 2016-09-23 22:25:27 -04:00