alistair23-linux/drivers/net/ethernet
Sean Wang e82f71489f net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits
add the missing commits about
1)
Commit d3bd1ce4db
("remove redundant free_irq for devm_request_ir allocated irq")
2)
Commit 7c6b0d76fa
("fix logic unbalance between probe and remove")

during merge for conflicts overlapping commits by
Commit b20b378d49
("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-09-22 02:05:03 -04:00
..
3com 3c59x: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:57 -07:00
8390
adaptec starfire: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:57 -07:00
adi
aeroflex
agere net: ethernet: et131x: constify ethtool_ops structures 2016-08-31 09:22:30 -07:00
allwinner
alteon
altera
amazon net: ena: change the return type of ena_set_push_mode() to be void. 2016-08-23 17:42:33 -07:00
amd ethernet: amd: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:58 -07:00
apm net: ethernet: apm: xgene: use new api ethtool_{get|set}_link_ksettings 2016-09-13 11:45:19 -04:00
apple
arc net: arc_emac: mark arc_mdio_reset() static 2016-09-06 15:58:59 -07:00
atheros alx: fix error handling in __alx_open 2016-09-15 20:15:26 -04:00
aurora
broadcom bnxt_en: Fix build error for kernesl without RTC-LIB 2016-09-20 03:53:49 -04:00
brocade
cadence net: macb: fix missing unlock on error in macb_start_xmit() 2016-09-13 11:42:27 -04:00
calxeda
cavium Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
chelsio cxgb4: add support for drop and redirect actions 2016-09-22 01:40:01 -04:00
cirrus
cisco
davicom
dec
dlink sundance: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:58 -07:00
emulex be2net: mark symbols static where possible 2016-09-19 21:52:10 -04:00
ezchip
faraday
freescale net: Remove NO_IRQ from powerpc-only network drivers 2016-09-13 11:40:51 -04:00
fujitsu
hisilicon hisilicon: constify net_device_ops structures 2016-09-17 10:07:23 -04:00
hp
i825xx i825xx: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:58 -07:00
ibm net: Remove NO_IRQ from powerpc-only network drivers 2016-09-13 11:40:51 -04:00
intel ixgbe: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:58 -07:00
marvell net: mvneta: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:59 -07:00
mediatek net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits 2016-09-22 02:05:03 -04:00
mellanox net/mlx4_core: Fix deadlock when switching between polling and event fw commands 2016-09-21 21:52:43 -04:00
micrel
microchip
moxa
myricom
natsemi natsemi: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:59 -07:00
neterion
netronome nfp: bpf: add offload of TC direct action mode 2016-09-21 19:50:03 -04:00
nuvoton
nvidia
nxp net: lpc_eth: Check clk_prepare_enable() error 2016-08-23 17:10:16 -07:00
oki-semi
packetengines
pasemi
qlogic Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
qualcomm net: emac: remove .owner field for driver 2016-09-16 04:25:50 -04:00
rdc net: r6040: add in missing white space in error message text 2016-09-18 22:22:16 -04:00
realtek 8139cp: Fix one possible deadloop in cp_rx_poll 2016-08-25 17:02:48 -07:00
renesas Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
rocker bridge: switchdev: Add forward mark support for stacked devices 2016-08-26 13:13:36 -07:00
samsung
seeq
sfc sfc: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:59 -07:00
sgi
silan
sis sis900: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:59 -07:00
smsc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
stmicro net: ethernet: dwmac: fix non static symbol warning 2016-09-13 11:42:27 -04:00
sun
synopsys dwc_eth_qos: constify net_device_ops structures 2016-09-17 10:07:23 -04:00
tehuti net: tehuti: fix typo: "eneble" -> "enable" 2016-08-21 15:21:36 -07:00
ti net: ti: cpmac: Fix compiler warning due to type confusion 2016-09-04 11:47:20 -07:00
tile
toshiba net: Remove NO_IRQ from powerpc-only network drivers 2016-09-13 11:40:51 -04:00
tundra
via via-velocity: remove null pointer check on array tdinfo->skb_dma 2016-09-09 18:17:33 -07:00
wiznet
xilinx net: ethernet: xilinx: Enable emaclite for MIPS 2016-09-08 16:06:37 -07:00
xircom
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
netx-eth.c