Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --cc drivers/net/wireless/wl12xx/boot.c
index 4ce634b925cb0ad5e16dadad4f1d654e54d37b54,6813379149767ea4c6236d6b43a0f1f0c219c8d1..6e140bf4e23666f8baf689320f2ab24e2c03482f
--- 1/drivers/net/wireless/wl12xx/boot.c
--- 2/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@@ -23,8 -23,8 +23,9 @@@
  
  #include <linux/slab.h>
  #include <linux/wl12xx.h>
+ #include <linux/export.h>
  
 +#include "debug.h"
  #include "acx.h"
  #include "reg.h"
  #include "boot.h"

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

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