diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-29 23:48:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-29 23:48:54 +0100 |
| commit | 64c27237a07129758e33f5f824ba5c33b7f57417 (patch) | |
| tree | 4c0c0a9b6d282d600f2226e1b3510096b9d789dd /firmware/edgeport | |
| parent | phy/at8031: enable at8031 to work on interrupt mode (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-64c27237a07129758e33f5f824ba5c33b7f57417.tar.xz linux-64c27237a07129758e33f5f824ba5c33b7f57417.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/marvell/mvneta.c
The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'firmware/edgeport')
0 files changed, 0 insertions, 0 deletions