Ralf Baechle edb15d83a8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next ...

Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.

2013-02-22 10:07:30 +01:00

..

bnx2x

bnx2x: Force link UP when the interface is in LOOPBACK mode

2013-02-02 22:59:25 -05:00

b44.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

2013-02-22 10:07:30 +01:00

b44.h

b44: add 64 bit stats

2012-07-18 09:29:43 -07:00

bcm63xx_enet.c

ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups

2013-02-04 13:22:33 -05:00

bcm63xx_enet.h

MIPS: BCM63XX: Move DMA descriptor definition into common header file

2012-08-30 20:15:52 +02:00

bgmac.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

2013-02-22 10:07:30 +01:00

bgmac.h

bgmac: return error on failed PHY write

2013-02-13 13:58:18 -05:00

bnx2_fw.h

broadcom: Move the Broadcom drivers

2011-08-10 19:54:39 -07:00

bnx2.c

remove init of dev->perm_addr in drivers

2013-01-08 18:00:48 -08:00

bnx2.h

cnic, bnx2x, bnx2: Simplify cnic probing.

2012-12-07 12:44:02 -05:00

cnic_defs.h

bnx2x,cnic: use FW 7.8.2

2012-10-01 16:43:17 -04:00

cnic_if.h

cnic, bnx2x: Add CNIC_DRV_STATE_HANDLES_IRQ to ethdev->drv_state

2013-01-23 13:58:29 -05:00

cnic.c

ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups

2013-02-04 13:22:33 -05:00

cnic.h

cnic: Include bnx2x.h

2012-12-07 12:44:02 -05:00

Kconfig

bgmac: driver for GBit MAC core on BCMA bus

2013-01-09 23:37:03 -08:00

Makefile

bgmac: driver for GBit MAC core on BCMA bus

2013-01-09 23:37:03 -08:00

sb1250-mac.c

net: phy: remove flags argument from phy_{attach, connect, connect_direct}

2013-01-14 15:11:50 -05:00

tg3.c

tg3: Use different macros for pci_chip_rev_id accesses

2013-02-18 12:45:53 -05:00

tg3.h

tg3: Use different macros for pci_chip_rev_id accesses

2013-02-18 12:45:53 -05:00