Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Simple merge

diff --cc drivers/net/ethernet/via/via-velocity.c
Simple merge

diff --cc drivers/net/macvlan.c
Simple merge

diff --cc drivers/net/macvtap.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc include/net/ip_tunnels.h
Simple merge

diff --cc include/net/sch_generic.h
index ffc9d883b163eb299ea07c09b243e40c57066d33,e5ae0c50fa9c5c481f991de92efd5e862d5bca67..76368c9d4503c124df44a5ed56fc942782209db8
--- 1/include/net/sch_generic.h
--- 2/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@@ -691,11 -690,15 +692,16 @@@ struct psched_ratecfg 
  static inline u64 psched_l2t_ns(const struct psched_ratecfg *r,
                                unsigned int len)
  {
-       return ((u64)(len + r->overhead) * r->mult) >> r->shift;
+       len += r->overhead;
+ 
+       if (unlikely(r->linklayer == TC_LINKLAYER_ATM))
+               return ((u64)(DIV_ROUND_UP(len,48)*53) * r->mult) >> r->shift;
+ 
+       return ((u64)len * r->mult) >> r->shift;
  }
  
 -extern void psched_ratecfg_precompute(struct psched_ratecfg *r, const struct tc_ratespec *conf);
 +void psched_ratecfg_precompute(struct psched_ratecfg *r,
 +                             const struct tc_ratespec *conf);
  
  static inline void psched_ratecfg_getrate(struct tc_ratespec *res,
                                          const struct psched_ratecfg *r)

diff --cc include/uapi/linux/snmp.h
Simple merge

diff --cc net/core/flow_dissector.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/ipv4/ip_gre.c
Simple merge

diff --cc net/ipv4/proc.c
Simple merge

diff --cc net/ipv6/ip6_fib.c
Simple merge

diff --cc net/sctp/associola.c
Simple merge

diff --cc net/sctp/transport.c
Simple merge

diff --cc net/vmw_vsock/af_vsock.c
Simple merge