Merge http://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw

diff --combined carlfw/Kconfig
index 3b7de610cc3fd2b2e27c861a92fe3d99afa70fd0,d1a68a1c60b813497a3268db6960468bdf92d8d3..1c5718ae60caa986ce1107e07043814dce4ced12
--- 1/carlfw/Kconfig
--- 2/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@@ -133,6 -133,24 +133,6 @@@ config CARL9170FW_PS
         Firmware will automatically turn it on again, when the
         PRETBTT event fires.
  
 -config CARL9170FW_DELAYED_TX
 -      def_bool n
 -      prompt "Delay and reorder TX"
 -      depends on CARL9170FW_EXPERIMENTAL
 -      ---help---
 -       Delay incoming TX' from the application until wlan_complete
 -       has finished.
 -
 -       This feature is necessary to keep A-MPDUs partially ordered.
 -
 -       Doesn't work 100% yet, but in most cases other HW designs can
 -       deal with the fallout.
 -
 -config CARL9170FW_TX_AMPDU
 -      def_bool n
 -      prompt "Firmware-supported ampdu scheduling"
 -      depends on CARL9170FW_EXPERIMENTAL
 -
  config CARL9170FW_WOL_OPTION
        def_bool n
        prompt "Wakeup on WLAN"
@@@ -158,7 -176,7 +158,7 @@@ config CARL9170FW_WOL_PROBE_REQUES
        def_bool n
        prompt "Probe Request"
        depends on CARL9170FW_WOL_OPTION
-       select CARL9170FW_WOL_CHECK
+       select CARL9170FW_WOL
        ---help---
         Scan probe requests for a given SSID.