Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorFelipe Balbi <balbi@ti.com>
Mon, 4 Mar 2013 09:22:22 +0000 (11:22 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 4 Mar 2013 09:22:22 +0000 (11:22 +0200)
commit4b482e591ba7aa2a3c65912e7c9475bb1ae9a98c
tree61c258fa97606dd4723ae13b085f17cce11a500f
parent35a94f1dbd15dc8de04851e38b8039c887b2655f
parent9c3a8d99346040010a82ae8088b055f85cf8a2e9
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx into connectivity-linux-3.8.y

* 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx: (483 commits)
  wlcore: fix wrong remote rates when starting STA role
  wl18xx: add new phy configuration parameters for telec support
  wlcore: don't hide real error code when booting fails
  wlcore: move wl12xx_platform_data up and make it truly optional
  wlcore: use PLATFORM_DEVID_AUTO for plat dev creation to avoid conflicts
  wlcore: use wl12xx_platform_data pointer from wlcore_pdev_data
  wlcore: remove if_ops from platform_data
  wlcore: remove unused set_power method
  wlcore: use single-role version when verifying the PLT firmware
  rtlwifi: rtl8723ae: Fix W=1 compile warnings
  rtlwifi: rtl8192de: Fix W=1 build warnings
  rtlwifi: rtl8192cu: Fix W=1 build warning
  rtlwifi: rtl8192c: Fix W=1 warning
  rtlwifi: Fix warnings in usb.c
  rtlwifi: Fix many compile warnings when using W=1
  wireless: rt2x00: rt2800pci add id
  bcma: cc: fix (and rename) define of NAND flash type
  ath9k: Remove unused variables in ath_mci_cleanup
  ath9k: Fix sparse __CHECK_ENDIAN__ for spectral code
  ath9k: Only remove spectral scan relay file when it was created
  ...

Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
20 files changed:
arch/arm/mach-omap2/board-omap3evm.c
drivers/bcma/bcma_private.h
drivers/bcma/driver_chipcommon_nflash.c
drivers/bcma/driver_gpio.c
drivers/bcma/driver_pci_host.c
drivers/bcma/main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rtlwifi/usb.c
drivers/nfc/pn544/i2c.c
drivers/ssb/driver_gpio.c
drivers/ssb/main.c
drivers/ssb/ssb_private.h
include/linux/bcma/bcma_driver_pci.h
net/mac80211/cfg.c
net/mac80211/mlme.c
net/wireless/core.c
net/wireless/reg.c