openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/ethernet/broadcom
History
David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/mwifiex/pcie.c
	net/ipv6/sit.c

The SIT driver conflict consists of a bug fix being done by hand
in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper
was created (netdev_alloc_pcpu_stats()) which takes care of this.

The two wireless conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2014-03-05 20:32:02 -05:00
..
bnx2x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-05 20:32:02 -05:00
genet net: bcmgenet: remove unused bh_lock member 2014-02-24 20:26:37 -05:00
Kconfig net: bcmgenet: hook into the build system 2014-02-14 00:27:58 -05:00
Makefile net: bcmgenet: hook into the build system 2014-02-14 00:27:58 -05:00
b44.c b44: always set duplex mode why phy changes 2014-03-02 19:05:25 -05:00
b44.h b44: use fixed PHY device if we do not find any 2013-12-20 20:48:49 -05:00
bcm63xx_enet.c bcm63xx_enet: remove deprecated IRQF_DISABLED 2013-09-11 16:09:58 -04:00
bcm63xx_enet.h bcm63xx_enet: add support Broadcom BCM6345 Ethernet 2013-06-13 17:22:08 -07:00
bgmac.c bgmac: propagate error codes in bgmac_probe() 2014-01-14 18:19:20 -08:00
bgmac.h bgmac: add support for Northstar SoC (BCM4707, BCM53018) 2014-01-04 20:25:20 -05:00
bnx2.c bnx2: Use pci_enable_msix_range() instead of pci_enable_msix() 2014-02-18 15:33:29 -05:00
bnx2.h bnx2: Report MDI/MDIX status to ethtool. 2014-01-01 22:03:38 -05:00
bnx2_fw.h
…
cnic.c cnic: Add a signature to indicate valid doorbell offset. 2014-01-01 22:08:08 -05:00
cnic.h cnic: Add a signature to indicate valid doorbell offset. 2014-01-01 22:08:08 -05:00
cnic_defs.h cnic: Update version to 2.5.17 and copyright year. 2013-07-29 22:03:07 -07:00
cnic_if.h cnic: Add a signature to indicate valid doorbell offset. 2014-01-01 22:08:08 -05:00
sb1250-mac.c drivers/net: delete non-required instances of include <linux/init.h> 2014-01-16 11:53:26 -08:00
tg3.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-05 20:32:02 -05:00
tg3.h tg3: Don't check undefined error bits in RXBD 2014-02-28 17:16:16 -05:00