From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 25 Aug 2010 18:51:42 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.37-rc1~147^2~679
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e569aa78ba01f7f66e016a4d57310fd041524d17;p=linux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/libertas/if_sdio.c
---

e569aa78ba01f7f66e016a4d57310fd041524d17
diff --cc drivers/net/wireless/libertas/cfg.c
index 3e82f1627209,03b7108505e7..317f086ced0a
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@@ -6,10 -6,9 +6,11 @@@
   *
   */
  
 +#include <linux/sched.h>
 +#include <linux/wait.h>
  #include <linux/slab.h>
  #include <linux/sched.h>
+ #include <linux/wait.h>
  #include <linux/ieee80211.h>
  #include <net/cfg80211.h>
  #include <asm/unaligned.h>