Merge branch 'upstream' into bugfix-video
authorLen Brown <len.brown@intel.com>
Mon, 4 Jun 2012 04:35:19 +0000 (00:35 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 4 Jun 2012 04:35:19 +0000 (00:35 -0400)
commit7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a
tree65c5898ba93007d4399150c7a127a670bcfbc30d
parent301f33fbcf4ced53b3de114846ecece5d6aafeeb
parentf8f5701bdaf9134b1f90e5044a82c66324d2073f
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>
drivers/gpu/drm/gma500/psb_drv.c