diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 16:05:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-03 16:05:35 +0100 |
| commit | 3f8ddb032afa729d4bad1bf2965d3ec068de6b72 (patch) | |
| tree | f2467d1160ee8cd4016fb77c09d0f1f4c768e5fe /arch/x86/platform/mrst/mrst.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| parent | hwspinlock: add MAINTAINERS entries (diff) | |
| download | linux-3f8ddb032afa729d4bad1bf2965d3ec068de6b72.tar.xz linux-3f8ddb032afa729d4bad1bf2965d3ec068de6b72.zip | |
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".
Diffstat (limited to 'arch/x86/platform/mrst/mrst.c')
0 files changed, 0 insertions, 0 deletions