forked from glfernando/remoteproc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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".
- Loading branch information
Showing
11 changed files
with
516 additions
and
226 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> | ||
S: Maintained | ||
F: Documentation/hwspinlock.txt | ||
F: drivers/hwspinlock/hwspinlock_* | ||
F: include/linux/hwspinlock.h | ||
|
||
HARMONY SOUND DRIVER | ||
M: Kyle McMartin <[email protected]> | ||
L: [email protected] | ||
|
@@ -4714,6 +4721,13 @@ S: Maintained | |
F: drivers/video/omap2/ | ||
F: Documentation/arm/OMAP/DSS | ||
|
||
OMAP HARDWARE SPINLOCK SUPPORT | ||
M: Ohad Ben-Cohen <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/hwspinlock/omap_hwspinlock.c | ||
F: arch/arm/mach-omap2/hwspinlock.c | ||
|
||
OMAP MMC SUPPORT | ||
M: Jarkko Lavinen <[email protected]> | ||
L: [email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.