Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
  hwspinlock: add MAINTAINERS entries
  hwspinlock/omap: omap_hwspinlock_remove should be __devexit
  hwspinlock/u8500: add hwspinlock driver
  hwspinlock/core: register a bank of hwspinlocks in a single API call
  hwspinlock/core: remove stubs for register/unregister
  hwspinlock/core: use a mutex to protect the radix tree
  hwspinlock/core/omap: fix id issues on multiple hwspinlock devices
  hwspinlock/omap: simplify allocation scheme
  hwspinlock/core: simplify 'owner' handling
  hwspinlock/core: simplify Kconfig

Fix up trivial conflicts (addition of omap_hwspinlock_pdata, removal of
omap_spinlock_latency) in arch/arm/mach-omap2/hwspinlock.c

Also, do an "evil merge" to fix a compile error in omap_hsmmc.c which
for some reason was reported in the same email thread as the "please
pull hwspinlock changes".

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/hwspinlock.c
index 36e21091b06aa534e9724850e0dfc36769e36f26,eb7e509957db5495f881e3875a5db631209c001e..454dfce125ca3e31337b2f2eb3c760ded2c51c60
--- 1/arch/arm/mach-omap2/hwspinlock.c
--- 2/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@@ -23,6 -24,18 +24,10 @@@
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
  
 -struct omap_device_pm_latency omap_spinlock_latency[] = {
 -      {
 -              .deactivate_func = omap_device_idle_hwmods,
 -              .activate_func   = omap_device_enable_hwmods,
 -              .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
 -      }
 -};
 -
+ static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
+       .base_id = 0,
+ };
+ 
  int __init hwspinlocks_init(void)
  {
        int retval = 0;
@@@ -40,11 -53,14 +45,13 @@@
        if (oh == NULL)
                return -EINVAL;
  
-       pdev = omap_device_build(dev_name, 0, oh, NULL, 0, NULL, 0, false);
 -      od = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
++      pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
+                               sizeof(struct hwspinlock_pdata),
 -                              omap_spinlock_latency,
 -                              ARRAY_SIZE(omap_spinlock_latency), false);
 -      if (IS_ERR(od)) {
++                              NULL, 0, false);
 +      if (IS_ERR(pdev)) {
                pr_err("Can't build omap_device for %s:%s\n", dev_name,
                                                                oh_name);
 -              retval = PTR_ERR(od);
 +              retval = PTR_ERR(pdev);
        }
  
        return retval;

diff --cc drivers/mmc/host/omap_hsmmc.c
index e8ff12396680cab635cb1ee370bd5c656cae9640,21e4a799df48b49bdbea53cefbc671375e944bf4..101cd31c82207982cf5986390a80f91c1053c535
--- 1/drivers/mmc/host/omap_hsmmc.c
--- 2/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -1270,7 -1271,7 +1270,7 @@@ static void omap_hsmmc_protect_card(str
                }
        } else {
                if (!host->protect_card) {
-                       pr_info"%s: cover is open, "
 -                      printk(KERN_INFO "%s: cover is open, "
++                      pr_info("%s: cover is open, "
                                         "card is now inaccessible\n",
                                         mmc_hostname(host->mmc));
                        host->protect_card = 1;