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

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

Conflicts:
	drivers/Kconfig
	drivers/Makefile
	drivers/misc/altera-stapl/altera.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/brcm80211/brcmfmac/dhd_linux.c
	drivers/staging/brcm80211/brcmsmac/mac80211_if.c
	drivers/staging/comedi/drivers/ni_labpc.c
	drivers/staging/et131x/et1310_tx.c
	drivers/staging/hv/Makefile
	drivers/staging/rtl8192e/r8192E_core.c
	drivers/staging/xgifb/XGI_main_26.c
	drivers/staging/zram/zram_drv.c