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

diff --cc MAINTAINERS
Simple merge

diff --cc crypto/ablkcipher.c
Simple merge

diff --cc crypto/aead.c
Simple merge

diff --cc crypto/crypto_user.c
Simple merge

diff --cc drivers/atm/horizon.c
Simple merge

diff --cc drivers/net/ethernet/8390/ax88796.c
Simple merge

diff --cc drivers/net/ethernet/8390/etherh.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge

diff --cc drivers/net/ethernet/marvell/pxa168_eth.c
Simple merge

diff --cc drivers/net/ethernet/marvell/sky2.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
Simple merge

diff --cc drivers/net/ethernet/neterion/s2io.c
Simple merge

diff --cc drivers/net/ethernet/nvidia/forcedeth.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.h
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/sun/sungem.c
Simple merge

diff --cc drivers/net/ethernet/sun/sunhme.c
Simple merge

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

diff --cc drivers/net/hippi/rrunner.c
Simple merge

diff --cc include/linux/ethtool.h
Simple merge

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

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

diff --cc net/core/skbuff.c
index b2595adb605f00469e4a2307eee0e2888609d854,baf8d281152cebc9e55ce8a7343d427b24b8b61e..a396a6926238ad90fd716b52a7999da6aa081416
--- 1/net/core/skbuff.c
--- 2/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -66,9 -66,9 +66,8 @@@
  #include <net/xfrm.h>
  
  #include <asm/uaccess.h>
- #include <asm/system.h>
  #include <trace/events/skb.h>
 -
 -#include "kmap_skb.h"
 +#include <linux/highmem.h>
  
  static struct kmem_cache *skbuff_head_cache __read_mostly;
  static struct kmem_cache *skbuff_fclone_cache __read_mostly;

diff --cc net/decnet/dn_dev.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge