| commit | 56a4342dfe3145cd66f766adccb28fd9b571606d | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jan 06 17:37:45 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jan 06 17:37:45 2014 -0500 |
| tree | d1593764488ff8cbb0b83cb9ae35fd968bf81760 | |
| parent | 805c1f4aedaba1bc8d839e7c27b128083dd5c2f0 [diff] | |
| parent | fe0d692bbc645786bce1a98439e548ae619269f5 [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>