Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Apr 2012 18:30:45 +0000 (14:30 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Apr 2012 18:30:45 +0000 (14:30 -0400)
41 files changed:
1  2 
MAINTAINERS
crypto/ablkcipher.c
crypto/aead.c
crypto/crypto_user.c
drivers/atm/horizon.c
drivers/net/ethernet/8390/ax88796.c
drivers/net/ethernet/8390/etherh.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/marvell/mv643xx_eth.c
drivers/net/ethernet/marvell/pxa168_eth.c
drivers/net/ethernet/marvell/sky2.c
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
drivers/net/ethernet/neterion/s2io.c
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/renesas/sh_eth.h
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/sun/sungem.c
drivers/net/ethernet/sun/sunhme.c
drivers/net/ethernet/via/via-rhine.c
drivers/net/hippi/rrunner.c
include/linux/ethtool.h
net/core/filter.c
net/core/rtnetlink.c
net/core/skbuff.c
net/decnet/dn_dev.c
net/ipv4/devinet.c
net/ipv4/fib_semantics.c
net/ipv4/igmp.c
net/ipv4/ipmr.c
net/ipv4/route.c
net/ipv6/icmp.c
net/ipv6/ip6mr.c
net/ipv6/mcast.c
net/netfilter/nf_conntrack_core.c
net/openvswitch/datapath.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc crypto/aead.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index b2595adb605f00469e4a2307eee0e2888609d854,baf8d281152cebc9e55ce8a7343d427b24b8b61e..a396a6926238ad90fd716b52a7999da6aa081416
@@@ -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;
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/igmp.c
Simple merge
diff --cc net/ipv4/ipmr.c
Simple merge
Simple merge
diff --cc net/ipv6/icmp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge