]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Nov 2011 15:05:35 +0000 (08:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Nov 2011 15:05:35 +0000 (08:05 -0700)
commit3f8ddb032afa729d4bad1bf2965d3ec068de6b72
treef2467d1160ee8cd4016fb77c09d0f1f4c768e5fe
parent30307c69d59b14723fbf8a524847b302388c702d
parent8b37fcfc9b3400b647748783a2cafff67793e0ad
Merge branch 'for-linus' of git://git./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".
MAINTAINERS
arch/arm/mach-omap2/hwspinlock.c
drivers/mmc/host/omap_hsmmc.c