diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-20 22:29:25 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-20 22:29:25 +1000 |
commit | 27a857089662daada8572f5933313f9654f3e3d1 (patch) | |
tree | ccc3a23e28d6394ce2e59701e6821457bc9f0f73 /MAINTAINERS | |
parent | 7152431e02a236c984bad867f0d049f8dd05f6c0 (diff) | |
parent | b97cadee805e49e823ffd5ad692bb4a9bbda248e (diff) |
Merge remote-tracking branch 'hwspinlock/for-next'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4161b1ecf56a..fa4b1e42f013 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7346,7 +7346,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> |