Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Tue, 27 Oct 2009 08:03:26 +0000 (01:03 -0700)]
Conflicts:
drivers/net/sh_eth.c

29 files changed:
1  2 
drivers/net/Kconfig
drivers/net/benet/be_cmds.c
drivers/net/benet/be_cmds.h
drivers/net/benet/be_main.c
drivers/net/bonding/bond_main.c
drivers/net/e1000e/e1000.h
drivers/net/ethoc.c
drivers/net/gianfar.c
drivers/net/ibm_newemac/core.c
drivers/net/igb/igb_ethtool.c
drivers/net/igbvf/ethtool.c
drivers/net/ixgbe/ixgbe_ethtool.c
drivers/net/myri10ge/myri10ge.c
drivers/net/netxen/netxen_nic_hdr.h
drivers/net/netxen/netxen_nic_hw.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/niu.c
drivers/net/r8169.c
drivers/net/sh_eth.c
drivers/net/virtio_net.c
include/net/inet_timewait_sock.h
net/bluetooth/l2cap.c
net/core/pktgen.c
net/ipv4/inet_connection_sock.c
net/ipv4/ip_sockglue.c
net/ipv4/tcp.c
net/ipv6/ipv6_sockglue.c
net/unix/af_unix.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
Simple merge
@@@ -30,7 -30,8 +30,9 @@@
  #include <linux/phy.h>
  #include <linux/cache.h>
  #include <linux/io.h>
 +#include <linux/pm_runtime.h>
+ #include <asm/cacheflush.h>
  #include "sh_eth.h"
  
  /* There is CPU dependent code */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
Simple merge