Merge branch 'upstream' into bugfix-video

Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.c

	text conflict: add comment vs delete neighboring line

	keep just this:
	/* igd_opregion_init(&dev_priv->opregion_dev); */
	/* acpi_video_register(); */

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc drivers/gpu/drm/gma500/psb_drv.c
index 09af2ffbb307abfff2079a94139a349a66246d27,caba6e08693cb83119f3f22e32ba8f14e1b4fbdd..b8a131fcb283308d6a3d2cc695fa08c91f2953ff
--- 1/drivers/gpu/drm/gma500/psb_drv.c
--- 2/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@@ -348,10 -327,7 +327,8 @@@ static int psb_driver_load(struct drm_d
        PSB_WSGX32(0x20000000, PSB_CR_PDS_EXEC_BASE);
        PSB_WSGX32(0x30000000, PSB_CR_BIF_3D_REQ_BASE);
  
 -      acpi_video_register();
 +/*    igd_opregion_init(&dev_priv->opregion_dev); */
 +/*    acpi_video_register(); */
-       if (dev_priv->lid_state)
-               psb_lid_timer_init(dev_priv);
  
        ret = drm_vblank_init(dev, dev_priv->num_pipe);
        if (ret)