Merge tag 'char-misc-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

Pull char/misc patches from Greg KH:
 "Here is the big char/misc driver pull request for 3.12-rc1

  Lots of driver updates all over the char/misc tree, full details in
  the shortlog"

* tag 'char-misc-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (62 commits)
  drivers: uio: Kconfig: add MMU dependancy for UIO
  drivers: uio: Add driver for Humusoft MF624 DAQ PCI card
  drivers: uio_pdrv_genirq: use dev_get_platdata()
  drivers: uio_pruss: use dev_get_platdata()
  drivers: uio_dmem_genirq: use dev_get_platdata()
  drivers: parport: Kconfig: exclude h8300 for PARPORT_PC
  drivers: misc: ti-st: fix potential race if st_kim_start fails
  Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely
  misc: vmw_balloon: Remove braces to fix build for clang.
  Drivers: hv: vmbus: Fix a bug in the handling of channel offers
  vme: vme_ca91cx42.c: fix to pass correct device identity to free_irq()
  VMCI: Add support for virtual IOMMU
  VMCI: Remove non-blocking/pinned queuepair support
  uio: uio_pruss: remove unnecessary platform_set_drvdata()
  parport: amiga: remove unnecessary platform_set_drvdata()
  vme: vme_vmivme7805.c: add missing __iomem annotation
  vme: vme_ca91cx42.c: add missing __iomem annotation
  vme: vme_tsi148.c: add missing __iomem annotation
  drivers/misc/hpilo: Correct panic when an AUX iLO is detected
  uio: drop unused vma_count member in uio_device struct
  ...

diff --cc drivers/usb/dwc3/Kconfig
Simple merge

diff --cc drivers/usb/dwc3/dwc3-omap.c
index ecd9945,b26c2a4..7f7ea62
--- 1/drivers/usb/dwc3/dwc3-omap.c
--- 2/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@@ -389,10 -457,20 +437,18 @@@ static int dwc3_omap_probe(struct platf
                return -EINVAL;
        }
  
 -      base = devm_ioremap_nocache(dev, res->start, resource_size(res));
 -      if (!base) {
 -              dev_err(dev, "ioremap failed\n");
 -              return -ENOMEM;
 -      }
 +      base = devm_ioremap_resource(dev, res);
 +      if (IS_ERR(base))
 +              return PTR_ERR(base);
  
+       if (of_property_read_bool(node, "vbus-supply")) {
+               vbus_reg = devm_regulator_get(dev, "vbus");
+               if (IS_ERR(vbus_reg)) {
+                       dev_err(dev, "vbus init failed\n");
+                       return PTR_ERR(vbus_reg);
+               }
+       }
+ 
        spin_lock_init(&omap->lock);
  
        omap->dev       = dev;

diff --cc include/linux/mfd/palmas.h
Simple merge