diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-06 23:37:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-06 23:37:45 +0100 |
| commit | 56a4342dfe3145cd66f766adccb28fd9b571606d (patch) | |
| tree | d1593764488ff8cbb0b83cb9ae35fd968bf81760 /arch/powerpc/kvm/timing.h | |
| parent | net_sched: act: action flushing missaccounting (diff) | |
| parent | bridge: use spin_lock_bh() in br_multicast_set_hash_max (diff) | |
| download | linux-56a4342dfe3145cd66f766adccb28fd9b571606d.tar.xz linux-56a4342dfe3145cd66f766adccb28fd9b571606d.zip | |
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>
Diffstat (limited to 'arch/powerpc/kvm/timing.h')
0 files changed, 0 insertions, 0 deletions