diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-03-10 18:33:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-10 18:33:49 -0400 |
| commit | 416377ea392823e8ea1f8a10477e7d08a9bb715e (patch) | |
| tree | f68c4ea48f6a1f2a1355fa479b9b154f2b59242d /net/vmw_vsock | |
| parent | 3ec320dd5c9465fbed3c84dd14ed3941ce757823 (diff) | |
| download | linux-416377ea392823e8ea1f8a10477e7d08a9bb715e.tar.gz linux-416377ea392823e8ea1f8a10477e7d08a9bb715e.tar.bz2 linux-416377ea392823e8ea1f8a10477e7d08a9bb715e.zip | |
macb: Fix merge error.
The code removed by commit 421d9df0628b ("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>
Diffstat (limited to 'net/vmw_vsock')
0 files changed, 0 insertions, 0 deletions