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".

1 files changed, 14 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4cb8c51b4792..ab7767001286 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3018,6 +3018,13 @@ F:	Documentation/hw_random.txt
 F:      drivers/char/hw_random/
 F:      include/linux/hw_random.h
 
+HARDWARE SPINLOCK CORE
+M:      Ohad Ben-Cohen <ohad@wizery.com>
+S:      Maintained
+F:      Documentation/hwspinlock.txt
+F:      drivers/hwspinlock/hwspinlock_*
+F:      include/linux/hwspinlock.h
+
 HARMONY SOUND DRIVER
 M:      Kyle McMartin <kyle@mcmartin.ca>
 L:      linux-parisc@vger.kernel.org
@@ -4714,6 +4721,13 @@ S:	Maintained
 F:      drivers/video/omap2/
 F:      Documentation/arm/OMAP/DSS
 
+OMAP HARDWARE SPINLOCK SUPPORT
+M:      Ohad Ben-Cohen <ohad@wizery.com>
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      drivers/hwspinlock/omap_hwspinlock.c
+F:      arch/arm/mach-omap2/hwspinlock.c
+
 OMAP MMC SUPPORT
 M:      Jarkko Lavinen <jarkko.lavinen@nokia.com>
 L:      linux-omap@vger.kernel.org