1
0
Files
linux/Documentation
Linus Torvalds 3f8ddb032a 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".
2011-11-03 08:05:35 -07:00
..
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-10-14 10:29:45 -03:00
2011-09-27 18:08:04 +02:00
2011-06-07 16:06:01 +02:00
2011-03-31 11:26:23 -03:00
2011-09-12 11:50:56 -07:00
2011-06-13 13:43:05 +02:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-10-30 03:09:40 -04:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2011-11-02 16:07:02 -07:00
2011-07-24 10:48:22 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-05-23 15:14:11 -07:00
2011-03-31 11:26:23 -03:00
2011-05-23 15:14:11 -07:00
2011-03-31 11:26:23 -03:00
2011-09-27 18:08:04 +02:00
2011-03-07 13:20:05 -08:00
2011-06-13 13:43:05 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00