Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/nes/nes_nic.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_multicast.c
Simple merge

diff --cc drivers/net/3c505.c
Simple merge

diff --cc drivers/net/3c523.c
Simple merge

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

diff --cc drivers/net/8139cp.c
Simple merge

diff --cc drivers/net/8139too.c
Simple merge

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

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

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

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

diff --cc drivers/net/arm/at91_ether.c
Simple merge

diff --cc drivers/net/arm/ixp4xx_eth.c
Simple merge

diff --cc drivers/net/arm/ks8695net.c
Simple merge

diff --cc drivers/net/arm/w90p910_ether.c
Simple merge

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

diff --cc drivers/net/atlx/atl2.c
Simple merge

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

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

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

diff --cc drivers/net/benet/be.h
Simple merge

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

diff --cc drivers/net/can/mcp251x.c
Simple merge

diff --cc drivers/net/chelsio/pm3393.c
Simple merge

diff --cc drivers/net/cris/eth_v10.c
Simple merge

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

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

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

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

diff --cc drivers/net/ehea/ehea_main.c
Simple merge

diff --cc drivers/net/enic/vnic_dev.c
Simple merge

diff --cc drivers/net/enic/vnic_rq.c
Simple merge

diff --cc drivers/net/enic/vnic_wq.c
Simple merge

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

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

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

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

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

diff --cc drivers/net/fs_enet/mac-fcc.c
Simple merge

diff --cc drivers/net/fs_enet/mac-fec.c
Simple merge

diff --cc drivers/net/fs_enet/mac-scc.c
Simple merge

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

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

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

diff --cc drivers/net/ibm_newemac/core.c
Simple merge

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

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

diff --cc drivers/net/igb/e1000_82575.c
Simple merge

diff --cc drivers/net/igb/igb_ethtool.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/igbvf/netdev.c
Simple merge

diff --cc drivers/net/ioc3-eth.c
Simple merge

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

diff --cc drivers/net/irda/ali-ircc.c
Simple merge

diff --cc drivers/net/irda/sh_sir.c
Simple merge

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

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ixgbevf/ixgbevf_main.c
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/net/mlx4/en_netdev.c
Simple merge

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

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

diff --cc drivers/net/netxen/netxen_nic_hw.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic_init.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic_main.c
Simple merge

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

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

diff --cc drivers/net/octeon/octeon_mgmt.c
Simple merge

diff --cc drivers/net/pcmcia/axnet_cs.c
Simple merge

diff --cc drivers/net/phy/cicada.c
Simple merge

diff --cc drivers/net/phy/davicom.c
Simple merge

diff --cc drivers/net/phy/et1011c.c
Simple merge

diff --cc drivers/net/phy/icplus.c
Simple merge

diff --cc drivers/net/phy/lxt.c
Simple merge

diff --cc drivers/net/phy/marvell.c
Simple merge

diff --cc drivers/net/phy/mdio-bitbang.c
Simple merge

diff --cc drivers/net/phy/qsemi.c
Simple merge

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

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

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

diff --cc drivers/net/qlcnic/qlcnic_hw.c
Simple merge

diff --cc drivers/net/qlcnic/qlcnic_init.c
Simple merge

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

diff --cc drivers/net/qlge/qlge_dbg.c
Simple merge

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

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

diff --cc drivers/net/sfc/efx.c
Simple merge

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

diff --cc drivers/net/skfp/skfddi.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc drivers/net/stmmac/dwmac100.c
Simple merge

diff --cc drivers/net/stmmac/dwmac1000_core.c
Simple merge

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

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

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

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

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

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

diff --cc drivers/net/tokenring/3c359.c
Simple merge

diff --cc drivers/net/tokenring/lanstreamer.c
Simple merge

diff --cc drivers/net/tokenring/tms380tr.c
Simple merge

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

diff --cc drivers/net/tulip/de2104x.c
Simple merge

diff --cc drivers/net/tulip/de4x5.c
Simple merge

diff --cc drivers/net/tulip/dmfe.c
Simple merge

diff --cc drivers/net/tulip/tulip_core.c
Simple merge

diff --cc drivers/net/tulip/uli526x.c
Simple merge

diff --cc drivers/net/tulip/winbond-840.c
Simple merge

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

diff --cc drivers/net/usb/asix.c
Simple merge

diff --cc drivers/net/usb/catc.c
Simple merge

diff --cc drivers/net/usb/dm9601.c
Simple merge

diff --cc drivers/net/usb/mcs7830.c
Simple merge

diff --cc drivers/net/usb/smsc75xx.c
Simple merge

diff --cc drivers/net/usb/smsc95xx.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

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

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

diff --cc drivers/net/vxge/vxge-config.c
Simple merge

diff --cc drivers/net/vxge/vxge-config.h
Simple merge

diff --cc drivers/net/vxge/vxge-ethtool.c
Simple merge

diff --cc drivers/net/vxge/vxge-main.c
Simple merge

diff --cc drivers/net/wan/pc300_drv.c
Simple merge

diff --cc drivers/net/wimax/i2400m/tx.c
Simple merge

diff --cc drivers/net/wireless/adm8211.c
Simple merge

diff --cc drivers/net/wireless/ath/ar9170/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/attach.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/eeprom.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/phy.c
index a8adca62e527aa9734a888def15da196ce94370b,68e2bccd90d34418d3b85070b0f7b09ee468a93f..3ee74c8397684b5c877be2631d14a95048eb95e4
--- 1/drivers/net/wireless/ath/ath5k/phy.c
--- 2/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@@ -20,7 -20,10 +20,8 @@@
   *
   */
  
 -#define _ATH5K_PHY
 -
  #include <linux/delay.h>
+ #include <linux/slab.h>
  
  #include "ath5k.h"
  #include "reg.h"

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/init.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/b43/phy_n.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-3945-rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-3945.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-debugfs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-rx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-scan.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-tx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/commands.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/debugfs.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/hal.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/main.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/rx.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/tx.c
Simple merge

diff --cc drivers/net/wireless/libertas/assoc.c
Simple merge

diff --cc drivers/net/wireless/libertas/main.c
Simple merge

diff --cc drivers/net/wireless/libertas/rx.c
Simple merge

diff --cc drivers/net/wireless/libertas/wext.c
Simple merge

diff --cc drivers/net/wireless/libertas_tf/main.c
Simple merge

diff --cc drivers/net/wireless/mwl8k.c
Simple merge

diff --cc drivers/net/wireless/orinoco/wext.c
Simple merge

diff --cc drivers/net/wireless/p54/main.c
Simple merge

diff --cc drivers/net/wireless/ray_cs.c
Simple merge

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8180_dev.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8187_dev.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1251_boot.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1251_main.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_acx.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_boot.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_cmd.c
index d005729e0312da51130bb7d2abecd2f10279cf43,e7832f3318eba7e38629e3f43adce326c6a6f411..92254d0d6c4cfe91b1f2cda603f46beaac31af96
--- 1/drivers/net/wireless/wl12xx/wl1271_cmd.c
--- 2/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@@ -26,7 -26,7 +26,8 @@@
  #include <linux/crc7.h>
  #include <linux/spi/spi.h>
  #include <linux/etherdevice.h>
 +#include <linux/ieee80211.h>
+ #include <linux/slab.h>
  
  #include "wl1271.h"
  #include "wl1271_reg.h"

diff --cc drivers/net/wireless/wl12xx/wl1271_debugfs.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_init.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_main.c
index 6036d0206fec45f4a738411f40ff134993e7b099,65a1aeba2419116f793a5cfba18ffae7b44839d7..aa970b759dd564dd8d50d71a4f584078827389df
--- 1/drivers/net/wireless/wl12xx/wl1271_main.c
--- 2/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@@ -28,8 -31,9 +28,9 @@@
  #include <linux/crc32.h>
  #include <linux/etherdevice.h>
  #include <linux/vmalloc.h>
 -#include <linux/spi/wl12xx.h>
  #include <linux/inetdevice.h>
 +#include <linux/platform_device.h>
+ #include <linux/slab.h>
  
  #include "wl1271.h"
  #include "wl12xx_80211.h"

diff --cc drivers/net/wireless/wl12xx/wl1271_rx.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_spi.c
index f44b05a32b0dea002d51103bbdedb03fd54931a5,053c84aceb4900263ddcd40b188467bfd4e73ce7..256e84ad0baff8e26d7fb96f2e8659552cbcc828
--- 1/drivers/net/wireless/wl12xx/wl1271_spi.c
--- 2/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/drivers/net/wireless/wl12xx/wl1271_spi.c
@@@ -21,11 -21,11 +21,12 @@@
   *
   */
  
 +#include <linux/irq.h>
  #include <linux/module.h>
 -#include <linux/platform_device.h>
  #include <linux/crc7.h>
  #include <linux/spi/spi.h>
 +#include <linux/spi/wl12xx.h>
+ #include <linux/slab.h>
  
  #include "wl1271.h"
  #include "wl12xx_80211.h"

diff --cc drivers/net/wireless/wl12xx/wl1271_testmode.c
Simple merge

diff --cc drivers/net/wireless/zd1201.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_mac.c
Simple merge

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

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

diff --cc drivers/s390/net/qeth_l2_main.c
Simple merge

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.c
Simple merge

diff --cc drivers/staging/et131x/et131x_netdev.c
Simple merge

diff --cc drivers/staging/vt6655/device_main.c
Simple merge

diff --cc drivers/staging/wlags49_h2/wl_netdev.c
Simple merge

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

diff --cc net/802/garp.c
Simple merge

diff --cc net/8021q/vlan.c
Simple merge

diff --cc net/8021q/vlan_dev.c
Simple merge

diff --cc net/appletalk/ddp.c
Simple merge

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

diff --cc net/bluetooth/bnep/netdev.c
Simple merge

diff --cc net/bridge/br_if.c
Simple merge

diff --cc net/bridge/br_input.c
Simple merge

diff --cc net/bridge/br_multicast.c
Simple merge

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

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

diff --cc net/core/ethtool.c
index 99e9f850ea07fa896fbb1862846a7a0489cfa857,9d55c57f318a7ac93f9362ee5245f07c473c906c..1a7db92037faef12e2671ad8eeecca241cd4c1eb
--- 1/net/core/ethtool.c
--- 2/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@@ -18,7 -18,8 +18,8 @@@
  #include <linux/ethtool.h>
  #include <linux/netdevice.h>
  #include <linux/bitops.h>
 -#include <asm/uaccess.h>
 +#include <linux/uaccess.h>
+ #include <linux/slab.h>
  
  /*
   * Some useful ethtool_ops methods that're device independent.

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

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

diff --cc net/dccp/input.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/ipv4/netfilter/ipt_CLUSTERIP.c
Simple merge

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

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

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

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

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

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

diff --cc net/irda/ircomm/ircomm_param.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ibss.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/rc80211_minstrel.c
Simple merge

diff --cc net/mac80211/rc80211_minstrel_debugfs.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/scan.c
index 75a85978c3b3d44faa808e6c798a7e530d500121,85507bd9e34109d3f06bb9248322b3b1ad7f615a..1ce4ce8af80fb8f2ea3a327d126a422c57cf828f
--- 1/net/mac80211/scan.c
--- 2/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@@ -14,8 -14,7 +14,9 @@@
  
  #include <linux/if_arp.h>
  #include <linux/rtnetlink.h>
 +#include <linux/pm_qos_params.h>
 +#include <net/sch_generic.h>
+ #include <linux/slab.h>
  #include <net/mac80211.h>
  
  #include "ieee80211_i.h"

diff --cc net/netlink/genetlink.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/rds/af_rds.c
Simple merge

diff --cc net/rds/cong.c
Simple merge

diff --cc net/rds/ib_cm.c
Simple merge

diff --cc net/rds/ib_rdma.c
Simple merge

diff --cc net/rds/ib_recv.c
Simple merge

diff --cc net/rds/iw_cm.c
Simple merge

diff --cc net/rds/iw_recv.c
Simple merge

diff --cc net/rds/loop.c
Simple merge

diff --cc net/rds/rdma.c
Simple merge

diff --cc net/rds/send.c
Simple merge

diff --cc net/rds/tcp_recv.c
Simple merge

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

diff --cc net/sched/act_api.c
Simple merge

diff --cc net/sched/cls_api.c
Simple merge

diff --cc net/sched/cls_u32.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/sched/sch_generic.c
Simple merge

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

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

diff --cc net/socket.c
Simple merge

diff --cc net/sunrpc/bc_svc.c
Simple merge

diff --cc net/wireless/mlme.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/wext-core.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge