Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath

Conflicts:
	drivers/net/wireless/ath/wil6210/wil6210.h

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/wil6210.h
index ce6488e42091cf8a935bfe87dd84baad34224656,1300b55051519cd0bcec0ddbba1d76414b0a5ce6..7ffaf2fce097ef212b41a15f1ddcc3f0e41896c5
--- 1/drivers/net/wireless/ath/wil6210/wil6210.h
--- 2/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@@ -461,10 -435,12 +461,13 @@@ struct wil6210_priv 
  #define wdev_to_wil(w) (struct wil6210_priv *)(wdev_priv(w))
  #define wil_to_ndev(i) (wil_to_wdev(i)->netdev)
  #define ndev_to_wil(n) (wdev_to_wil(n->ieee80211_ptr))
 +#define wil_to_pcie_dev(i) (&i->pdev->dev)
  
 -int wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);
+ __printf(2, 3)
 +void wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);
+ __printf(2, 3)
  void wil_err(struct wil6210_priv *wil, const char *fmt, ...);
+ __printf(2, 3)
  void wil_info(struct wil6210_priv *wil, const char *fmt, ...);
  #define wil_dbg(wil, fmt, arg...) do { \
        netdev_dbg(wil_to_ndev(wil), fmt, ##arg); \