diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-10 04:38:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-10 04:38:02 +0100 |
| commit | 3cef5c5b0b56f3f90b0e9ff8d3f8dc57f464cc14 (patch) | |
| tree | 02e95f15bd8a04071a9a36f534a92a066a8ce66a /drivers/net/ethernet/broadcom/tg3.c | |
| parent | net: bcmgenet: core changes for supporting multiple Rx queues (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-3cef5c5b0b56f3f90b0e9ff8d3f8dc57f464cc14.tar.xz linux-3cef5c5b0b56f3f90b0e9ff8d3f8dc57f464cc14.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cadence/macb.c
Overlapping changes in macb driver, mostly fixes and cleanups
in 'net' overlapping with the integration of at91_ether into
macb in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
0 files changed, 0 insertions, 0 deletions