Linus Torvalds acff987d94 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)
2011-10-30 15:30:01 -07:00
..
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-10-03 15:52:22 +00:00
2010-10-15 15:53:27 +02:00
2011-10-03 15:52:22 +00:00
2011-03-22 17:43:59 -07:00
2011-03-22 17:43:59 -07:00
2011-07-26 16:49:47 -07:00
2011-10-03 15:52:38 +00:00
2011-10-03 15:52:38 +00:00
2011-10-03 15:52:22 +00:00
2011-03-31 11:26:23 -03:00
2009-12-16 07:20:04 -08:00
2009-05-06 16:36:10 -07:00
2011-09-01 00:31:05 +00:00
2011-03-22 16:18:51 +09:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2010-05-25 08:07:09 -07:00
2011-03-22 16:07:32 +09:00
2011-09-27 18:08:04 +02:00
2010-02-27 18:31:16 +01:00
2010-02-27 18:31:14 +01:00
2011-09-14 16:40:52 +00:00
2011-10-03 15:52:22 +00:00
2011-03-31 11:26:23 -03:00
2011-10-03 15:52:22 +00:00
2011-10-03 15:52:22 +00:00
2011-10-03 15:52:22 +00:00
2010-12-21 01:05:43 +09:00
2011-10-03 15:52:22 +00:00
2011-10-03 15:52:22 +00:00
2010-05-25 08:07:09 -07:00
2011-06-24 17:14:39 +09:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2010-06-16 18:05:05 +02:00
2011-10-03 15:52:22 +00:00
2011-06-24 17:14:39 +09:00
2010-02-27 18:31:13 +01:00
2011-07-04 16:02:48 +09:00
2011-10-03 15:52:22 +00:00
2011-03-31 11:26:23 -03:00