]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 270be3d) | 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)
commitd5f5398f7cfb609f2289b765f6960189342af698
treef68c4ea48f6a1f2a1355fa479b9b154f2b59242dtree | snapshot
parent270be3dafd670b72e39b4b86d875d906318890a1commit | diff
macb: Fix merge error.

The code removed by commit a134768bfa96 ("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.