Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III
2015-06-22 10:57:36 -07:00
114 changed files with 1394 additions and 412 deletions
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
CONFIG_IEEE80211W=y
CONFIG_TLS=openssl
CONFIG_TLSV11=y
CONFIG_TLSV12=y
#CONFIG_TLSV12=y see #8332
CONFIG_IEEE80211R=y
CONFIG_DEBUG_SYSLOG=y
#CONFIG_PRIVSEP=y