diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 09:57:44 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 09:57:44 -0400 |
| commit | 801cffdae716aec1bc101f8722054b865cd67799 (patch) | |
| tree | 2c3411ee1260ff0c53e06ed4ee65019abaf009ca /MAINTAINERS | |
| parent | 1be030ee4c589acb079c578a00686a54942d88fb (diff) | |
| parent | c4202c86cdd53c91744d652ec0e16fd28ff6d6f3 (diff) | |
Merge remote-tracking branch 'tmlind/dss2' into linaro-2.6.38
Conflicts:
arch/arm/mach-omap2/board-overo.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fae62205b78..b142d8459c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4521,14 +4521,14 @@ S: Maintained F: sound/soc/omap/ OMAP FRAMEBUFFER SUPPORT -M: Tomi Valkeinen <tomi.valkeinen@nokia.com> +M: Tomi Valkeinen <tomi.valkeinen@ti.com> L: linux-fbdev@vger.kernel.org L: linux-omap@vger.kernel.org S: Maintained F: drivers/video/omap/ OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2) -M: Tomi Valkeinen <tomi.valkeinen@nokia.com> +M: Tomi Valkeinen <tomi.valkeinen@ti.com> L: linux-omap@vger.kernel.org L: linux-fbdev@vger.kernel.org S: Maintained |