Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

# Conflicts:
#	drivers/staging/rtl8723bs/core/rtw_ap.c
#	drivers/staging/rtl8723bs/core/rtw_cmd.c
#	drivers/staging/rtl8723bs/core/rtw_efuse.c
#	drivers/staging/rtl8723bs/core/rtw_ieee80211.c
#	drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
#	drivers/staging/rtl8723bs/core/rtw_mlme.c
#	drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
#	drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
#	drivers/staging/rtl8723bs/core/rtw_recv.c
#	drivers/staging/rtl8723bs/core/rtw_security.c
#	drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
#	drivers/staging/rtl8723bs/core/rtw_wlan_util.c
#	drivers/staging/rtl8723bs/core/rtw_xmit.c
#	drivers/staging/rtl8723bs/hal/Hal8723BReg.h
#	drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
#	drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h
#	drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
#	drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h
#	drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
#	drivers/staging/rtl8723bs/hal/HalPhyRf.c
#	drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
#	drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h
#	drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c
#	drivers/staging/rtl8723bs/hal/hal_btcoex.c
#	drivers/staging/rtl8723bs/hal/hal_com.c
#	drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
#	drivers/staging/rtl8723bs/hal/hal_intf.c
#	drivers/staging/rtl8723bs/hal/odm.c
#	drivers/staging/rtl8723bs/hal/odm.h
#	drivers/staging/rtl8723bs/hal/odm_DIG.h
#	drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h
#	drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
#	drivers/staging/rtl8723bs/hal/odm_HWConfig.c
#	drivers/staging/rtl8723bs/hal/odm_HWConfig.h
#	drivers/staging/rtl8723bs/hal/odm_precomp.h
#	drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
#	drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
#	drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
#	drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
#	drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
#	drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c
#	drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
#	drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
#	drivers/staging/rtl8723bs/hal/sdio_halinit.c
#	drivers/staging/rtl8723bs/hal/sdio_ops.c
#	drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h
#	drivers/staging/rtl8723bs/include/basic_types.h
#	drivers/staging/rtl8723bs/include/cmd_osdep.h
#	drivers/staging/rtl8723bs/include/drv_types.h
#	drivers/staging/rtl8723bs/include/hal_com.h
#	drivers/staging/rtl8723bs/include/hal_com_h2c.h
#	drivers/staging/rtl8723bs/include/hal_com_phycfg.h
#	drivers/staging/rtl8723bs/include/hal_com_reg.h
#	drivers/staging/rtl8723bs/include/hal_data.h
#	drivers/staging/rtl8723bs/include/hal_intf.h
#	drivers/staging/rtl8723bs/include/hal_pg.h
#	drivers/staging/rtl8723bs/include/hal_phy.h
#	drivers/staging/rtl8723bs/include/ieee80211.h
#	drivers/staging/rtl8723bs/include/ioctl_cfg80211.h
#	drivers/staging/rtl8723bs/include/osdep_intf.h
#	drivers/staging/rtl8723bs/include/osdep_service.h
#	drivers/staging/rtl8723bs/include/osdep_service_linux.h
#	drivers/staging/rtl8723bs/include/rtl8723b_cmd.h
#	drivers/staging/rtl8723bs/include/rtl8723b_dm.h
#	drivers/staging/rtl8723bs/include/rtl8723b_hal.h
#	drivers/staging/rtl8723bs/include/rtl8723b_spec.h
#	drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
#	drivers/staging/rtl8723bs/include/rtw_ap.h
#	drivers/staging/rtl8723bs/include/rtw_cmd.h
#	drivers/staging/rtl8723bs/include/rtw_eeprom.h
#	drivers/staging/rtl8723bs/include/rtw_efuse.h
#	drivers/staging/rtl8723bs/include/rtw_ht.h
#	drivers/staging/rtl8723bs/include/rtw_io.h
#	drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
#	drivers/staging/rtl8723bs/include/rtw_mlme.h
#	drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
#	drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
#	drivers/staging/rtl8723bs/include/rtw_recv.h
#	drivers/staging/rtl8723bs/include/rtw_security.h
#	drivers/staging/rtl8723bs/include/rtw_xmit.h
#	drivers/staging/rtl8723bs/include/sdio_ops.h
#	drivers/staging/rtl8723bs/include/sta_info.h
#	drivers/staging/rtl8723bs/include/wlan_bssdef.h
#	drivers/staging/rtl8723bs/include/xmit_osdep.h
#	drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
#	drivers/staging/rtl8723bs/os_dep/os_intfs.c
#	drivers/staging/rtl8723bs/os_dep/sdio_intf.c
#	drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
#	drivers/staging/rtl8723bs/os_dep/xmit_linux.c

0 files changed, 0 insertions, 0 deletions