linux/drivers/net/ethernet/broadcom
David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-23 23:15:17 -04:00
..
bnx2x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-23 23:15:17 -04:00
Kconfig
Makefile
b44.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-26 21:55:51 -05:00
b44.h
bcm63xx_enet.c bcm63xx-enet: fix PHY name to match MDIO bus name 2012-02-13 16:04:08 -05:00
bcm63xx_enet.h
bnx2.c broadcom: replace open-coded ARRAY_SIZE with macro 2012-04-13 13:15:14 -04:00
bnx2.h bnx2: Add support for ethtool --show-channels|--set-channels 2012-02-05 22:42:00 -05:00
bnx2_fw.h
cnic.c cnic: Fix parity error code conflict 2012-03-21 21:57:36 -04:00
cnic.h
cnic_defs.h cnic: Fix parity error code conflict 2012-03-21 21:57:36 -04:00
cnic_if.h cnic: Fix parity error code conflict 2012-03-21 21:57:36 -04:00
sb1250-mac.c drivers/net: Remove alloc_etherdev error messages 2012-01-31 16:20:48 -05:00
tg3.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-10 14:30:45 -04:00
tg3.h tg3: Fix RSS ring refill race condition 2012-03-21 21:57:36 -04:00