]> asedeno.scripts.mit.edu Git - linux.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)
commite82f71489ffb325a9b7bca367b06a39315452dfe
tree8f482b230ba29ca34b43be519cb824d7d3bb347a
parentf9d1846f137a26d38c058c497b70babc606839be
net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits

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

during merge for conflicts overlapping commits by
Commit b20b378d49926b82c0a131492fa8842156e0e8a9
("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