Merge branch 'release/qcomlt-4.4' into stable-4.4

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/mm/dma-mapping.c
Simple merge

diff --cc drivers/base/platform.c
index 176b59f5bc4717925e174ce18d794470cf58b91e,835dbee900eef0bc39fd8366ebf995de0f83cded..c385585b8e2037880c0163f54f599d9e1a28fea4
--- 1/drivers/base/platform.c
--- 2/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -512,18 -512,21 +512,26 @@@ static int platform_drv_probe(struct de
        if (ret < 0)
                return ret;
  
+       ret = of_dma_configure_ops(_dev, _dev->of_node);
+       if (ret < 0)
+               goto done;
+ 
        ret = dev_pm_domain_attach(_dev, true);
 -      if (ret != -EPROBE_DEFER && drv->probe) {
 -              ret = drv->probe(dev);
 -              if (ret)
 -                      dev_pm_domain_detach(_dev, true);
 +      if (ret != -EPROBE_DEFER) {
 +              if (drv->probe) {
 +                      ret = drv->probe(dev);
 +                      if (ret)
 +                              dev_pm_domain_detach(_dev, true);
 +              } else {
 +                      /* don't fail if just dev_pm_domain_attach failed */
 +                      ret = 0;
 +              }
        }
  
+       if (ret)
+               of_dma_deconfigure(_dev);
+ 
+ done:
        if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
                dev_warn(_dev, "probe deferral not supported\n");
                ret = -ENXIO;

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc drivers/mmc/host/mmci.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/regulator/Kconfig
Simple merge