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

Conflicts:
	drivers/staging/media/mn88473/mn88473.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma/ste_dma40.c
Simple merge

diff --cc drivers/iio/adc/Kconfig
Simple merge

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

diff --cc drivers/staging/lustre/lustre/llite/file.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/rw26.c
Simple merge

diff --cc drivers/staging/media/bcm2048/radio-bcm2048.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_resizer.c
Simple merge

diff --cc drivers/staging/media/mn88472/mn88472.c
Simple merge

diff --cc drivers/staging/media/mn88473/mn88473.c
Simple merge

diff --cc drivers/staging/nvec/nvec_power.c
index 30b66c3c9b731910ba1ce20863cd9128c4c04849,3621b661aba80b4a3f7823e0db7122f8092949ad..04a7402ae2df4531fee978a24c1fc82e3e712095
--- 1/drivers/staging/nvec/nvec_power.c
--- 2/drivers/staging/nvec/nvec_power.c
+++ b/drivers/staging/nvec/nvec_power.c
@@@ -371,14 -373,12 +371,14 @@@ static void nvec_power_poll(struct work
  
  static int nvec_power_probe(struct platform_device *pdev)
  {
 -      struct power_supply *psy;
 +      struct power_supply **psy;
 +      const struct power_supply_desc *psy_desc;
        struct nvec_power *power;
        struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
 +      struct power_supply_config psy_cfg = {};
  
        power = devm_kzalloc(&pdev->dev, sizeof(struct nvec_power), GFP_NOWAIT);
-       if (power == NULL)
+       if (!power)
                return -ENOMEM;
  
        dev_set_drvdata(&pdev->dev, power);

diff --cc drivers/staging/octeon/ethernet.c
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
Simple merge

diff --cc drivers/staging/unisys/include/timskmod.h
Simple merge