diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 21:04:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 21:04:04 -0800 |
| commit | 90aeb7c01c2da631cb611871a50980cbb6ca7149 (patch) | |
| tree | 0f46706d61bd5f125e351cfa3a133b88a27bdc1f /MAINTAINERS | |
| parent | 2c761270d5520dd84ab0b4e47c24d99ff8503c38 (diff) | |
| parent | 807a7515aea421f2b340140482ed4c8811c523c6 (diff) | |
| download | kernel_goldelico_gta04-90aeb7c01c2da631cb611871a50980cbb6ca7149.zip kernel_goldelico_gta04-90aeb7c01c2da631cb611871a50980cbb6ca7149.tar.gz kernel_goldelico_gta04-90aeb7c01c2da631cb611871a50980cbb6ca7149.tar.bz2 | |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded
OMAP: DSS2: Reject scaling settings when they cannot be supported
OMAP: DSS2: Make check-delay-loops consistent
OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c
OMAP: DSS2: Fix compile warning
MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
MAINTAINERS: change omapfb maintainer
OMAP: OMAPFB: add dummy release function for omapdss
OMAP: OMAPFB: fix clk_get for RFBI
OMAP: DSS2: RFBI: convert to new kfifo API
OMAP: DSS2: Fix crash when panel doesn't define enable_te()
OMAP: DSS2: Collect interrupt statistics
OMAP: DSS2: DSI: print debug DCS cmd in hex
OMAP: DSS2: DSI: fix VC channels in send_short and send_null
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6914588..c8f47bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3940,29 +3940,20 @@ S: Maintained F: sound/soc/omap/ OMAP FRAMEBUFFER SUPPORT -M: Imre Deak <imre.deak@nokia.com> +M: Tomi Valkeinen <tomi.valkeinen@nokia.com> L: linux-fbdev@vger.kernel.org L: linux-omap@vger.kernel.org S: Maintained F: drivers/video/omap/ -OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2) +OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2) M: Tomi Valkeinen <tomi.valkeinen@nokia.com> L: linux-omap@vger.kernel.org -L: linux-fbdev@vger.kernel.org (moderated for non-subscribers) +L: linux-fbdev@vger.kernel.org S: Maintained -F: drivers/video/omap2/dss/ -F: drivers/video/omap2/vrfb.c -F: drivers/video/omap2/vram.c +F: drivers/video/omap2/ F: Documentation/arm/OMAP/DSS -OMAP FRAMEBUFFER SUPPORT (FOR DSS2) -M: Tomi Valkeinen <tomi.valkeinen@nokia.com> -L: linux-omap@vger.kernel.org -L: linux-fbdev@vger.kernel.org (moderated for non-subscribers) -S: Maintained -F: drivers/video/omap2/omapfb/ - OMAP MMC SUPPORT M: Jarkko Lavinen <jarkko.lavinen@nokia.com> L: linux-omap@vger.kernel.org |