Merge branch 'master' into ozonet

diff --cc config/Config-kernel.in
Simple merge

diff --cc package/kernel/linux/modules/fs.mk
Simple merge

diff --cc package/kernel/mac80211/ath.mk
index c0d828f92040fdb05673494c5a866f4dda5c3dbb,5db4be8daa760e7391d773e1d89553bab526944f..a95e6ce5ae7e721262d2868359c9dc031e198ec0
--- 1/package/kernel/mac80211/ath.mk
--- 2/package/kernel/mac80211/ath.mk
+++ b/package/kernel/mac80211/ath.mk
@@@ -3,22 -3,25 +3,16 @@@ PKG_DRIVERS += 
        carl9170 owl-loader ar5523
  
  PKG_CONFIG_DEPENDS += \
--      CONFIG_PACKAGE_ATH_DEBUG \
--      CONFIG_PACKAGE_ATH_DFS \
        CONFIG_PACKAGE_ATH_SPECTRAL \
        CONFIG_PACKAGE_ATH_DYNACK \
        CONFIG_ATH9K_HWRNG \
        CONFIG_ATH9K_SUPPORT_PCOEM \
--      CONFIG_ATH9K_TX99 \
--      CONFIG_ATH10K_LEDS \
--      CONFIG_ATH10K_THERMAL \
        CONFIG_ATH_USER_REGD
  
  ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
    config-y += \
        ATH9K_DEBUGFS \
 -      ATH9K_HTC_DEBUGFS \
--      ATH10K_DEBUGFS \
 -      CARL9170_DEBUGFS \
 -      ATH5K_DEBUG \
 -      ATH6KL_DEBUG
 +      ATH5K_DEBUG 
  endif
  
  ifdef CONFIG_PACKAGE_MAC80211_TRACING

diff --cc package/network/services/hostapd/files/hostapd.sh
index 8aef19516e0eb66c0434144c263698a5b0db7a99,b33e8e1edc047812c38899b8aa0fb4bc512d01e0..7a22ec39ce0e1b67dd17d4f16b6d807122ad49ae
--- 1/package/network/services/hostapd/files/hostapd.sh
--- 2/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@@ -116,8 -119,9 +119,9 @@@ hostapd_prepare_device_config() 
  
        set_default country_ie 1
        set_default spectrum_mgmt_required 0
 -      set_default doth 1
 +      set_default doth 0
        set_default legacy_rates 1
+       set_default airtime_mode 0
  
        [ "$hwmode" = "b" ] && legacy_rates=1
  

diff --cc target/linux/generic/pending-4.14/834-ledtrig-libata.patch
Simple merge