Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/freescale/fsl_pq_mdio.c net/batman-adv/translation-table.c net/ipv6/route.c
No related branches found
No related tags found
Showing
- drivers/net/ethernet/freescale/fec.c 7 additions, 4 deletionsdrivers/net/ethernet/freescale/fec.c
- drivers/net/ethernet/freescale/fsl_pq_mdio.c 6 additions, 7 deletionsdrivers/net/ethernet/freescale/fsl_pq_mdio.c
- drivers/net/ppp/pptp.c 1 addition, 3 deletionsdrivers/net/ppp/pptp.c
- drivers/net/wireless/ath/ath9k/main.c 1 addition, 1 deletiondrivers/net/wireless/ath/ath9k/main.c
- drivers/net/wireless/rtlwifi/rtl8192ce/phy.c 1 addition, 1 deletiondrivers/net/wireless/rtlwifi/rtl8192ce/phy.c
- drivers/net/wireless/rtlwifi/rtl8192cu/phy.c 1 addition, 1 deletiondrivers/net/wireless/rtlwifi/rtl8192cu/phy.c
- drivers/net/wireless/rtlwifi/rtl8192de/phy.c 1 addition, 1 deletiondrivers/net/wireless/rtlwifi/rtl8192de/phy.c
- drivers/net/wireless/rtlwifi/rtl8192se/phy.c 1 addition, 1 deletiondrivers/net/wireless/rtlwifi/rtl8192se/phy.c
- drivers/ssb/driver_pcicore.c 6 additions, 2 deletionsdrivers/ssb/driver_pcicore.c
- net/batman-adv/translation-table.c 20 additions, 4 deletionsnet/batman-adv/translation-table.c
- net/ipv4/ipip.c 6 additions, 1 deletionnet/ipv4/ipip.c
- net/ipv6/addrconf.c 2 additions, 1 deletionnet/ipv6/addrconf.c
- net/ipv6/route.c 1 addition, 1 deletionnet/ipv6/route.c
- net/ipv6/sit.c 6 additions, 1 deletionnet/ipv6/sit.c
- net/mac80211/agg-tx.c 41 additions, 45 deletionsnet/mac80211/agg-tx.c
- net/sched/sch_gred.c 1 addition, 1 deletionnet/sched/sch_gred.c
Loading
Please register or sign in to comment