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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc net/mac80211/Kconfig
index c766056,4c57a9c..dbf5e40
--- 1/net/mac80211/Kconfig
--- 2/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@@ -17,10 -17,10 +17,10 @@@ comment "CFG80211 needs to be enabled f
  if MAC80211 != n
  
  config MAC80211_HAS_RC
-       def_bool n
+       bool
  
  config MAC80211_RC_PID
 -      bool "PID controller based rate control algorithm" if EMBEDDED
 +      bool "PID controller based rate control algorithm" if EXPERT
        select MAC80211_HAS_RC
        ---help---
          This option enables a TX rate control algorithm for