From: Len Brown <len.brown@intel.com>
Date: Mon, 4 Jun 2012 04:35:19 +0000 (-0400)
Subject: Merge branch 'upstream' into bugfix-video
X-Git-Tag: v3.5-rc2~19^2^5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a;p=pandora-kernel.git

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>
---

7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a
Reading git-diff-tree failed