diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:13:07 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:13:07 -0400 |
| commit | 1c49cb09b5666aa0d6df3b58f6c621df92c5dd44 (patch) | |
| tree | d6a35f8063d31033bf8059a296ba8dfbf046a373 /MAINTAINERS | |
| parent | d79a08c56985fd3d7bd158687a1a162697935349 (diff) | |
| parent | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (diff) | |
Merge commit '05f6894' (omap-for-linus) into linaro-2.6.38
Conflicts:
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/usb-musb.c
arch/arm/plat-omap/include/plat/usb.h
drivers/usb/musb/musb_core.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 053cbc5ddf8..fae62205b78 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4498,11 +4498,21 @@ S: Maintained F: arch/arm/*omap*/*clock* OMAP POWER MANAGEMENT SUPPORT -M: Kevin Hilman <khilman@deeprootsystems.com> +M: Kevin Hilman <khilman@ti.com> L: linux-omap@vger.kernel.org S: Maintained F: arch/arm/*omap*/*pm* +OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT +M: Rajendra Nayak <rnayak@ti.com> +M: Paul Walmsley <paul@pwsan.com> +L: linux-omap@vger.kernel.org +S: Maintained +F: arch/arm/mach-omap2/powerdomain2xxx_3xxx.c +F: arch/arm/mach-omap2/powerdomain44xx.c +F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c +F: arch/arm/mach-omap2/clockdomain44xx.c + OMAP AUDIO SUPPORT M: Jarkko Nikula <jhnikula@gmail.com> L: alsa-devel@alsa-project.org (subscribers-only) |