]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fda473d e113f21)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 6 Jan 2014 22:37:45 +0000 (17:37 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Jan 2014 22:37:45 +0000 (17:37 -0500)
commita938adb280b2b56011f3696d3a9a50df6c5426ce
treed1593764488ff8cbb0b83cb9ae35fd968bf81760tree | snapshot
parentfda473d2980ccaf30754adc7755ccc40c0cb9052commit | diff
parente113f2190edd3b3b4a8aece7d6148b30811a75bacommit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
net/ipv6/ip6_tunnel.c
net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller <davem@davemloft.net>
68 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/bluetooth/ath3k.c diff1 | diff2 | blob | history
drivers/bluetooth/btusb.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_3ad.c diff1 | diff2 | blob | history
drivers/net/ethernet/arc/emac_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/tg3.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/sge.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/e1000e/netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/cpsw.c diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc_drv.c diff1 | diff2 | blob | history
drivers/net/macvlan.c diff1 | diff2 | blob | history
drivers/net/phy/phy.c diff1 | diff2 | blob | history
drivers/net/usb/mcs7830.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/ar9002_mac.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/main.c diff1 | diff2 | blob | history
drivers/net/wireless/rtlwifi/pci.c diff1 | diff2 | blob | history
drivers/net/xen-netback/common.h diff1 | diff2 | blob | history
drivers/net/xen-netback/interface.c diff1 | diff2 | blob | history
drivers/net/xen-netback/netback.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/sctp/structs.h diff1 | diff2 | blob | history
net/batman-adv/translation-table.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/neighbour.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/ip6_tunnel.c diff1 | diff2 | blob | history
net/ipv6/ip6_vti.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/ipv6/sit.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_nfct.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/netfilter/nfnetlink_log.c diff1 | diff2 | blob | history
net/rose/af_rose.c diff1 | diff2 | blob | history
net/sched/act_csum.c diff1 | diff2 | blob | history
net/sched/act_gact.c diff1 | diff2 | blob | history
net/sched/act_ipt.c diff1 | diff2 | blob | history
net/sched/act_nat.c diff1 | diff2 | blob | history
net/sched/act_pedit.c diff1 | diff2 | blob | history
net/sched/act_police.c diff1 | diff2 | blob | history
net/sched/act_simple.c diff1 | diff2 | blob | history
net/sched/act_skbedit.c diff1 | diff2 | blob | history
net/sctp/outqueue.c diff1 | diff2 | blob | history
net/tipc/port.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.