From: David S. Miller <davem@davemloft.net>
Date: Sun, 11 Apr 2010 21:53:53 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=871039f02f8ec4ab2e5e9010718caa8e085786f1;p=linux-edison.git

Merge branch 'master' of /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
---

871039f02f8ec4ab2e5e9010718caa8e085786f1
diff --cc drivers/net/wireless/ath/ath5k/phy.c
index a8adca62e52,68e2bccd90d..3ee74c83976
--- a/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/wl12xx/wl1271_cmd.c
index d005729e031,e7832f3318e..92254d0d6c4
--- a/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_main.c
index 6036d0206fe,65a1aeba241..aa970b759dd
--- a/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_spi.c
index f44b05a32b0,053c84aceb4..256e84ad0ba
--- a/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 net/core/ethtool.c
index 99e9f850ea0,9d55c57f318..1a7db92037f
--- a/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 <linux/uaccess.h>
+ #include <linux/slab.h>
 -#include <asm/uaccess.h>
  
  /*
   * Some useful ethtool_ops methods that're device independent.
diff --cc net/mac80211/scan.c
index 75a85978c3b,85507bd9e34..1ce4ce8af80
--- a/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"