diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-11 12:20:03 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-11 12:20:03 -0500 |
| commit | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 (patch) | |
| tree | fbdc2ddb066243a11aebc490c4d54e6a42be51e2 /MAINTAINERS | |
| parent | 94a06b74e724caabcf0464c81527cfbcae0c8aff (diff) | |
| parent | a08572ae529b1e8de12393eeced661feae8fd44c (diff) | |
Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 939e852ef74d..44fb12177980 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4506,6 +4506,16 @@ L: linux-omap@vger.kernel.org | |||
| 4506 | S: Maintained | 4506 | S: Maintained |
| 4507 | F: arch/arm/*omap*/*pm* | 4507 | F: arch/arm/*omap*/*pm* |
| 4508 | 4508 | ||
| 4509 | OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT | ||
| 4510 | M: Rajendra Nayak <rnayak@ti.com> | ||
| 4511 | M: Paul Walmsley <paul@pwsan.com> | ||
| 4512 | L: linux-omap@vger.kernel.org | ||
| 4513 | S: Maintained | ||
| 4514 | F: arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | ||
| 4515 | F: arch/arm/mach-omap2/powerdomain44xx.c | ||
| 4516 | F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | ||
| 4517 | F: arch/arm/mach-omap2/clockdomain44xx.c | ||
| 4518 | |||
| 4509 | OMAP AUDIO SUPPORT | 4519 | OMAP AUDIO SUPPORT |
| 4510 | M: Jarkko Nikula <jhnikula@gmail.com> | 4520 | M: Jarkko Nikula <jhnikula@gmail.com> |
| 4511 | L: alsa-devel@alsa-project.org (subscribers-only) | 4521 | L: alsa-devel@alsa-project.org (subscribers-only) |