• Linus Torvalds's avatar
    Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6 · 43753826
    Linus Torvalds authored
    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
      ...
    43753826
setup.c 32.3 KB