| author | Felipe Balbi <balbi@ti.com> | |
| Mon, 4 Mar 2013 09:22:22 +0000 (11:22 +0200) | ||
| committer | Felipe Balbi <balbi@ti.com> | |
| Mon, 4 Mar 2013 09:22:22 +0000 (11:22 +0200) | ||
| commit | 4b482e591ba7aa2a3c65912e7c9475bb1ae9a98c | |
| tree | 61c258fa97606dd4723ae13b085f17cce11a500f | tree | snapshot (tar.xz tar.gz zip) |
| parent | 35a94f1dbd15dc8de04851e38b8039c887b2655f | commit | diff |
| parent | 9c3a8d99346040010a82ae8088b055f85cf8a2e9 | commit | diff |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/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
* '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: