diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 01:27:36 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 01:27:36 -0400 |
| commit | da49252fb0392d8196833ef3da92e48fb371f8d7 (patch) | |
| tree | 1299899f7513a900b2229b8cde289bca8c41d2f5 /MAINTAINERS | |
| parent | eddecbb601c9ea3fab7e67d7892010fc9426d1e6 (diff) | |
| parent | b295d6e593e02168fdafc5db11464b6d51cf239d (diff) | |
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
arch/arm/mach-omap2/board-overo.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 38077a656820..5b28ed0b60c6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4542,14 +4542,14 @@ S: Maintained | |||
| 4542 | F: sound/soc/omap/ | 4542 | F: sound/soc/omap/ |
| 4543 | 4543 | ||
| 4544 | OMAP FRAMEBUFFER SUPPORT | 4544 | OMAP FRAMEBUFFER SUPPORT |
| 4545 | M: Tomi Valkeinen <tomi.valkeinen@nokia.com> | 4545 | M: Tomi Valkeinen <tomi.valkeinen@ti.com> |
| 4546 | L: linux-fbdev@vger.kernel.org | 4546 | L: linux-fbdev@vger.kernel.org |
| 4547 | L: linux-omap@vger.kernel.org | 4547 | L: linux-omap@vger.kernel.org |
| 4548 | S: Maintained | 4548 | S: Maintained |
| 4549 | F: drivers/video/omap/ | 4549 | F: drivers/video/omap/ |
| 4550 | 4550 | ||
| 4551 | OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2) | 4551 | OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2) |
| 4552 | M: Tomi Valkeinen <tomi.valkeinen@nokia.com> | 4552 | M: Tomi Valkeinen <tomi.valkeinen@ti.com> |
| 4553 | L: linux-omap@vger.kernel.org | 4553 | L: linux-omap@vger.kernel.org |
| 4554 | L: linux-fbdev@vger.kernel.org | 4554 | L: linux-fbdev@vger.kernel.org |
| 4555 | S: Maintained | 4555 | S: Maintained |