Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Tue, 22 Feb 2011 20:10:22 +0000 (15:10 -0500)]
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
net/mac80211/Kconfig

diff --cc MAINTAINERS
Simple merge
@@@ -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