diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 14:52:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 14:52:25 -0700 |
| commit | d033ed9eeafc3bf33ce2de286ea2fb2c63e1c183 (patch) | |
| tree | 21d877cc15c04c6717411a3d0fe948318291af04 /MAINTAINERS | |
| parent | 6361c845ceab326a306412349fa6b125700b2cec (diff) | |
| parent | bd5717a4632cdecafe82d03de7dcb3b1876e2828 (diff) | |
| download | linux-d033ed9eeafc3bf33ce2de286ea2fb2c63e1c183.tar.gz linux-d033ed9eeafc3bf33ce2de286ea2fb2c63e1c183.tar.bz2 linux-d033ed9eeafc3bf33ce2de286ea2fb2c63e1c183.zip | |
Merge tag 'hwspinlock-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
Pull hwspinlock updates from Ohad Ben-Cohen:
- hwspinlock core DT support from Suman Anna
- OMAP hwspinlock DT support from Suman Anna
- QCOM hwspinlock DT support from Bjorn Andersson
- a new CSR atlas7 hwspinlock driver from Wei Chen
- CSR atlas7 hwspinlock DT binding document from Wei Chen
- a tiny QCOM hwspinlock driver fix from Bjorn Andersson
* tag 'hwspinlock-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
hwspinlock: qcom: Correct msb in regmap_field
DT: hwspinlock: add the CSR atlas7 hwspinlock bindings document
hwspinlock: add a CSR atlas7 driver
hwspinlock: qcom: Add support for Qualcomm HW Mutex block
DT: hwspinlock: Add binding documentation for Qualcomm hwmutex
hwspinlock/omap: add support for dt nodes
Documentation: dt: add the omap hwspinlock bindings document
hwspinlock/core: add device tree support
Documentation: dt: add common bindings for hwspinlock
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 86ea2084bc58..e23ff1cbd12b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7364,7 +7364,6 @@ 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> |