Merge remote-tracking branch 'hwspinlock/linux-next'

Conflicts:
	arch/arm/mach-omap2/hwspinlock.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/hwspinlock.c
index 0b3ae9d9c3b33feac975126ad3f869d49b8fdeef,eb7e509957db5495f881e3875a5db631209c001e..9c0de1d9eef2a1f691d4e8609a8b087029a148a7
--- 1/arch/arm/mach-omap2/hwspinlock.c
--- 2/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@@ -48,13 -53,14 +53,14 @@@ int __init hwspinlocks_init(void
        if (oh == NULL)
                return -EINVAL;
  
-       pdev = omap_device_build(dev_name, 0, oh, NULL, 0,
 -      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)) {
 +      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;