Merge remote-tracking branch 'staging/staging-next'

diff --cc drivers/staging/dgap/dgap_driver.c
Simple merge

diff --cc drivers/staging/dgnc/dgnc_driver.c
Simple merge

diff --cc drivers/staging/lustre/lustre/Kconfig
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
Simple merge

diff --cc drivers/staging/rtl8188eu/core/rtw_wlan_util.c
Simple merge

diff --cc drivers/staging/rtl8188eu/include/odm.h
Simple merge