diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:55:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:55:47 +1100 |
| commit | 45c7e0f733d063ed81002100a005a16f3fc58abf (patch) | |
| tree | db15d7dc57f8589485f82df76aaa1157c898a886 /MAINTAINERS | |
| parent | 2625773d0492c4253c0f66f04a2d5ae6aaa50741 (diff) | |
| parent | 799a6268ead76a3572ede4e5bf0d296f4fa3ce96 (diff) | |
Merge remote-tracking branch 'omap_dss2/for-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6405cc11d2fa..22aa12f0cd9e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4511,14 +4511,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 |