Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (69 commits) pptp: Accept packet with seq zero RDS: Remove some unused iWARP code net: fsl: fec: handle 10Mbps speed in RMII mode drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: add missing iounmap drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap ksz884x: fix mtu for VLAN net_sched: sfq: add optional RED on top of SFQ dp83640: Fix NOHZ local_softirq_pending 08 warning gianfar: Fix invalid TX frames returned on error queue when time stamping gianfar: Fix missing sock reference when processing TX time stamps phylib: introduce mdiobus_alloc_size() net: decrement memcg jump label when limit, not usage, is changed net: reintroduce missing rcu_assign_pointer() calls inet_diag: Rename inet_diag_req_compat into inet_diag_req inet_diag: Rename inet_diag_req into inet_diag_req_v2 bond_alb: don't disable softirq under bond_alb_xmit mac80211: fix rx->key NULL pointer dereference in promiscuous mode nl80211: fix old station flags compatibility mdio-octeon: use an unique MDIO bus name. mdio-gpio: use an unique MDIO bus name. ...
Showing
- drivers/isdn/i4l/Kconfig 1 addition, 1 deletiondrivers/isdn/i4l/Kconfig
- drivers/net/bonding/bond_alb.c 76 additions, 36 deletionsdrivers/net/bonding/bond_alb.c
- drivers/net/ethernet/8390/ax88796.c 2 additions, 1 deletiondrivers/net/ethernet/8390/ax88796.c
- drivers/net/ethernet/adi/bfin_mac.c 2 additions, 1 deletiondrivers/net/ethernet/adi/bfin_mac.c
- drivers/net/ethernet/amd/au1000_eth.c 2 additions, 1 deletiondrivers/net/ethernet/amd/au1000_eth.c
- drivers/net/ethernet/broadcom/bcm63xx_enet.c 1 addition, 1 deletiondrivers/net/ethernet/broadcom/bcm63xx_enet.c
- drivers/net/ethernet/broadcom/sb1250-mac.c 2 additions, 1 deletiondrivers/net/ethernet/broadcom/sb1250-mac.c
- drivers/net/ethernet/cadence/macb.c 2 additions, 1 deletiondrivers/net/ethernet/cadence/macb.c
- drivers/net/ethernet/dnet.c 2 additions, 1 deletiondrivers/net/ethernet/dnet.c
- drivers/net/ethernet/freescale/fec.c 8 additions, 4 deletionsdrivers/net/ethernet/freescale/fec.c
- drivers/net/ethernet/freescale/fec.h 4 additions, 0 deletionsdrivers/net/ethernet/freescale/fec.h
- drivers/net/ethernet/freescale/gianfar.c 24 additions, 10 deletionsdrivers/net/ethernet/freescale/gianfar.c
- drivers/net/ethernet/freescale/gianfar.h 3 additions, 0 deletionsdrivers/net/ethernet/freescale/gianfar.h
- drivers/net/ethernet/lantiq_etop.c 4 additions, 1 deletiondrivers/net/ethernet/lantiq_etop.c
- drivers/net/ethernet/marvell/mv643xx_eth.c 2 additions, 1 deletiondrivers/net/ethernet/marvell/mv643xx_eth.c
- drivers/net/ethernet/marvell/pxa168_eth.c 2 additions, 1 deletiondrivers/net/ethernet/marvell/pxa168_eth.c
- drivers/net/ethernet/micrel/ksz884x.c 1 addition, 1 deletiondrivers/net/ethernet/micrel/ksz884x.c
- drivers/net/ethernet/renesas/sh_eth.c 2 additions, 1 deletiondrivers/net/ethernet/renesas/sh_eth.c
- drivers/net/ethernet/s6gmac.c 1 addition, 1 deletiondrivers/net/ethernet/s6gmac.c
- drivers/net/ethernet/smsc/smsc911x.c 2 additions, 1 deletiondrivers/net/ethernet/smsc/smsc911x.c
Loading
Please register or sign in to comment