diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 20:43:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 20:43:40 -0700 |
| commit | 437538267b672f9320833907f1b5acbb2605f4be (patch) | |
| tree | d10173b35a5b86bc037bb2ece1b406d5575a2094 /MAINTAINERS | |
| parent | 9586c959bfc917695893bef0102433a7d0675691 (diff) | |
| parent | 6bff98b455cf3e666fd0e3d0d908eba874de0eee (diff) | |
| download | linux-437538267b672f9320833907f1b5acbb2605f4be.tar.gz | |
Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6
Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
- drivers for Samsung Exynos MIPI DSI and display port
- i740fb to support those old Intel chips
- large updates to OMAP, viafb and sh_mobile_lcdcfb
- some updates to s3c-fb and udlfb, few patches to others
Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
it in twice.
* tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
OMAPDSS: register dss drivers in module init
video: pxafb: add clk_prepare/clk_unprepare calls
fbdev: bfin_adv7393fb: Drop needless include
fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
Revert "MAINTAINERS: add entry for exynos mipi display drivers"
fbdev: da8xx: add support for SP10Q010 display
fbdev: da8xx:: fix reporting of the display timing info
drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
fbdev: sh_mobile_meram: Implement system suspend/resume
fbdev: sh_mobile_meram: Remove unneeded sanity checks
fbdev: sh_mobile_meram: Don't perform update in register operation
arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
fbdev: sh_mobile_lcdc: Don't store copy of platform data
fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
fbdev: sh_mobile_meram: Allocate ICBs automatically
fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 83753d04f82b..95eba3135018 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2257,6 +2257,15 @@ F: Documentation/filesystems/quota.txt F: fs/quota/ F: include/linux/quota*.h +DISPLAYLINK USB 2.0 FRAMEBUFFER DRIVER (UDLFB) +M: Bernie Thompson <bernie@plugable.com> +L: linux-fbdev@vger.kernel.org +S: Maintained +W: http://plugable.com/category/projects/udlfb/ +F: drivers/video/udlfb.c +F: include/video/udlfb.h +F: Documentation/fb/udlfb.txt + DISTRIBUTED LOCK MANAGER (DLM) M: Christine Caulfield <ccaulfie@redhat.com> M: David Teigland <teigland@redhat.com> @@ -2378,15 +2387,6 @@ S: Supported F: drivers/gpu/drm/exynos F: include/drm/exynos* -EXYNOS MIPI DISPLAY DRIVERS -M: Inki Dae <inki.dae@samsung.com> -M: Donghwa Lee <dh09.lee@samsung.com> -M: Kyungmin Park <kyungmin.park@samsung.com> -L: linux-fbdev@vger.kernel.org -S: Maintained -F: drivers/video/exynos/exynos_mipi* -F: include/video/exynos_mipi* - DSCC4 DRIVER M: Francois Romieu <romieu@fr.zoreil.com> L: netdev@vger.kernel.org @@ -2667,6 +2667,21 @@ M: Mimi Zohar <zohar@us.ibm.com> S: Supported F: security/integrity/evm/ +EXYNOS DP DRIVER +M: Jingoo Han <jg1.han@samsung.com> +L: linux-fbdev@vger.kernel.org +S: Maintained +F: drivers/video/exynos/exynos_dp* + +EXYNOS MIPI DISPLAY DRIVERS +M: Inki Dae <inki.dae@samsung.com> +M: Donghwa Lee <dh09.lee@samsung.com> +M: Kyungmin Park <kyungmin.park@samsung.com> +L: linux-fbdev@vger.kernel.org +S: Maintained +F: drivers/video/exynos/exynos_mipi* +F: include/video/exynos_mipi* + F71805F HARDWARE MONITORING DRIVER M: Jean Delvare <khali@linux-fr.org> L: lm-sensors@lm-sensors.org |