]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 89aab2c) | patch
macb: Fix merge error.
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Mar 2015 22:33:49 +0000 (18:33 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2015 22:33:49 +0000 (18:33 -0400)
commit6836092f20a7fc997967893ed2db75e5f0101ed1
treef68c4ea48f6a1f2a1355fa479b9b154f2b59242dtree | snapshot
parent89aab2cb95f9f405be5d68c750655d6c69fd12c1commit | diff
macb: Fix merge error.

The code removed by commit 2b0e952a67ac ("net/macb: merge
at91_ether driver into macb driver") should be removed
in the merge resolution as well.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb.c diff | blob | history
Linux Kernel Source Tree.