]> git.baikalelectronics.ru Git - kernel.git/commit
net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits
authorSean Wang <sean.wang@mediatek.com>
Tue, 20 Sep 2016 15:53:24 +0000 (23:53 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Sep 2016 06:05:03 +0000 (02:05 -0400)
commit8642af47f4b8ac1ebd58bb2b8f825a0fdf2d54a1
tree8f482b230ba29ca34b43be519cb824d7d3bb347a
parent1fd174432c9198734c70baacb51edb3e4a7d5e86
net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits

add the missing commits about
1)
Commit acd965f33e2e01b106bcba22780d1e0d53a2bc7f
("remove redundant free_irq for devm_request_ir allocated irq")
2)
Commit f4371ae7bfc0446089ff2bdce75098c486cca741
("fix logic unbalance between probe and remove")

during merge for conflicts overlapping commits by
Commit d3604fd747fc1c2436adef4ac6f5492922b4e01d
("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>
drivers/net/ethernet/mediatek/mtk_eth_soc.c