Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
  video: platinumfb: Add __devexit_p at necessary place
  drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
  drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
  drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
  drivers/video: fsl-diu-fb: remove unused panel operating mode support
  drivers/video: fsl-diu-fb: use an enum for the AOI index
  drivers/video: fsl-diu-fb: add several new video modes
  drivers/video: fsl-diu-fb: remove broken screen blanking support
  drivers/video: fsl-diu-fb: move some definitions out of the header file
  drivers/video: fsl-diu-fb: fix some ioctls
  video: da8xx-fb: Increased resolution configuration of revised LCDC IP
  OMAPDSS: picodlp: add missing #include <linux/module.h>
  fb: fix au1100fb bitrot.
  mx3fb: fix NULL pointer dereference in screen blanking.
  video: irq: Remove IRQF_DISABLED
  smscufx: change edid data to u8 instead of char
  OMAPDSS: DISPC: zorder support for DSS overlays
  OMAPDSS: DISPC: VIDEO3 pipeline support
  OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
  video/omap: fix build dependencies
  ...

Fix up conflicts in:
 - drivers/staging/xgifb/XGI_main_26.c
	Changes to XGIfb_pan_var()
 - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
	Removed (or in the case of apollon.c, merged into the generic
	DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)

diff --cc MAINTAINERS
index 07e5dbd14273598524e0be11501af7643739dff4,5f57e66ed072e5a28486c938a45fe3e6dbcc5813..2014c1ff8197f8350ee7a439d7ff69f7e8bc8223
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5968,8 -5928,14 +5968,14 @@@ SMSC9420 PCI ETHERNET DRIVE
  M:    Steve Glendinning <steve.glendinning@smsc.com>
  L:    netdev@vger.kernel.org
  S:    Supported
 -F:    drivers/net/smsc9420.*
 +F:    drivers/net/ethernet/smsc/smsc9420.*
  
+ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
+ M:    Steve Glendinning <steve.glendinning@smsc.com>
+ L:    linux-fbdev@vger.kernel.org
+ S:    Supported
+ F:    drivers/video/smscufx.c
+ 
  SN-IA64 (Itanium) SUB-PLATFORM
  M:    Jes Sorensen <jes@sgi.com>
  L:    linux-altix@sgi.com

diff --cc arch/arm/mach-omap2/board-2430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-am3517evm.c
Simple merge

diff --cc arch/arm/mach-omap2/board-apollon.c
Simple merge

diff --cc arch/arm/mach-omap2/board-cm-t35.c
Simple merge

diff --cc arch/arm/mach-omap2/board-devkit8000.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/board-igep0020.c
Simple merge

diff --cc arch/arm/mach-omap2/board-ldp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3stalker.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3touchbook.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/board-overo.c
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
index 4de92dc570b061b9bc09e36e4324c4e18a03a2e9,c5497ac9936bedd9f010ac8b7c9f419a3e5b95f5..3689ad2e9156b42711f4f63fb799292b7fc4595d
--- 1/arch/arm/mach-shmobile/board-mackerel.c
--- 2/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@@ -1597,16 -1587,8 +1597,17 @@@ static void __init mackerel_init(void
  
        sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
        sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device);
+       sh7372_add_device_to_domain(&sh7372_a4lc, &meram_device);
        sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);
 +      sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs0_device);
 +      sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs1_device);
 +      sh7372_add_device_to_domain(&sh7372_a3sp, &sh_mmcif_device);
 +      sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi0_device);
 +#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 +      sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi1_device);
 +#endif
 +      sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi2_device);
 +      sh7372_add_device_to_domain(&sh7372_a4r, &ceu_device);
  
        hdmi_init_pm_clock();
        sh7372_pm_init();

diff --cc drivers/staging/xgifb/XGI_main_26.c
index 36db231cd804c51e6f0dc23d987857ba7d98a10a,f8b88add9520dab5c4cfe6a934711f85a26be5ec..277e408c39c58d8829bce56f5bb97a7cab4f968e
--- 1/drivers/staging/xgifb/XGI_main_26.c
--- 2/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1300,9 -1363,9 +1300,9 @@@ static int XGIfb_do_set_var(struct fb_v
        return 0;
  }
  
- static int XGIfb_pan_var(struct xgifb_video_info *xgifb_info,
-                        struct fb_var_screeninfo *var)
 -#ifdef XGIFB_PAN
+ static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
  {
++      struct xgifb_video_info *xgifb_info = info->par;
        unsigned int base;
  
        /* printk("Inside pan_var"); */

diff --cc drivers/video/atmel_lcdfb.c
Simple merge