diff options
| author |   Sean Wang <sean.wang@mediatek.com> | 2016-09-20 23:53:24 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-09-22 02:05:03 -0400 |
| commit | e82f71489ffb325a9b7bca367b06a39315452dfe (patch) | |
| tree | 8f482b230ba29ca34b43be519cb824d7d3bb347a /drivers/net/ethernet/hisilicon | |
| parent | Merge branch 'cxgb4-tc-offload' (diff) | |
| download | linux-dev-e82f71489ffb325a9b7bca367b06a39315452dfe.tar.xz linux-dev-e82f71489ffb325a9b7bca367b06a39315452dfe.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/hisilicon')
0 files changed, 0 insertions, 0 deletions