| commit | 64c27237a07129758e33f5f824ba5c33b7f57417 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Mar 29 18:48:54 2014 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Mar 29 18:48:54 2014 -0400 |
| tree | 4c0c0a9b6d282d600f2226e1b3510096b9d789dd | |
| parent | 77a9939426f7a3f35f460afc9b11f1fe45955409 [diff] | |
| parent | 49d8137a4039c63c834827f4bfe875e27bb9c521 [diff] |
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>