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

Conflicts:
	drivers/staging/comedi/drivers/ni_labpc.c
	drivers/staging/rtl8192e/r8192E_core.c
	drivers/staging/xgifb/XGI_main_26.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_labpc.c
Simple merge

diff --cc drivers/staging/et131x/et131x_netdev.c
Simple merge

diff --cc drivers/staging/hv/Makefile
index 14e3c6a14ea42c3f27c2b3e727f295f2b90e7211,bd176b1f231e989d2b027ce60d3f357d1ace1078..3e0d7e6edf4951fa3b7410e6e326430290666313
--- 1/drivers/staging/hv/Makefile
--- 2/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@@ -1,6 -1,5 +1,5 @@@
 -obj-$(CONFIG_HYPERV)          += hv_vmbus.o hv_timesource.o
 +obj-$(CONFIG_HYPERV)          += hv_vmbus.o
  obj-$(CONFIG_HYPERV_STORAGE)  += hv_storvsc.o
- obj-$(CONFIG_HYPERV_BLOCK)    += hv_blkvsc.o
  obj-$(CONFIG_HYPERV_NET)      += hv_netvsc.o
  obj-$(CONFIG_HYPERV_UTILS)    += hv_utils.o
  obj-$(CONFIG_HYPERV_MOUSE)    += hv_mouse.o

diff --cc drivers/staging/hv/netvsc_drv.c
Simple merge

diff --cc drivers/staging/iio/addac/adt7316-i2c.c
Simple merge

diff --cc drivers/staging/iio/dds/ad9832.c
Simple merge

diff --cc drivers/staging/vt6655/device_main.c
Simple merge

diff --cc drivers/staging/vt6656/main_usb.c
Simple merge

diff --cc drivers/staging/xgifb/XGI_main_26.c
index f8b88add9520dab5c4cfe6a934711f85a26be5ec,7b36b7ea4640c99b976950f8e1244747ecc5c87d..5c6bae48799ce0ba399284ec07849edc898e201d
--- 1/drivers/staging/xgifb/XGI_main_26.c
--- 2/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1357,7 +1357,7 @@@ static int XGIfb_do_set_var(struct fb_v
        return 0;
  }
  
- #ifdef XGIFB_PAN
 -static int XGIfb_pan_var(struct fb_var_screeninfo *var)
 +static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
  {
        unsigned int base;
  

diff --cc drivers/staging/zcache/zcache-main.c
Simple merge

diff --cc drivers/staging/zram/zram_drv.c
Simple merge