diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-05 20:12:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-05 20:12:20 +0100 |
| commit | 188d1f76d0dd3715ceeadfa31376867c3395eb41 (patch) | |
| tree | b8976427ec21d3c346f2a993160b368c620c249a /drivers/bcma/host_pci.c | |
| parent | qlcnic: Updating copyright information. (diff) | |
| parent | net: usbnet: fix tx_dropped statistics (diff) | |
| download | linux-188d1f76d0dd3715ceeadfa31376867c3395eb41.tar.xz linux-188d1f76d0dd3715ceeadfa31376867c3395eb41.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/wireless/iwlwifi/dvm/tx.c
net/ipv6/route.c
The ipv6 route.c conflict is simple, just ignore the 'net' side change
as we fixed the same problem in 'net-next' by eliminating cached
neighbours from ipv6 routes.
The e1000e conflict is an addition of a new statistic in the ethtool
code, trivial.
The vmxnet3 conflict is about one change in 'net' removing a guarding
conditional, whilst in 'net-next' we had a netdev_info() conversion.
The iwlwifi conflict is dealing with a WARN_ON() conversion in
'net-next' vs. a revert happening in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bcma/host_pci.c')
0 files changed, 0 insertions, 0 deletions