From: Dave Airlie <airlied@redhat.com>
Date: Mon, 1 Mar 2010 06:22:38 +0000 (+1000)
Subject: Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage
X-Git-Tag: v2.6.34-rc1~209^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c62233508ef7104f8a78e571fdf5c72d0dc0200;p=pandora-kernel.git

Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage

* 'gpu-switcher' of /ssd/git//linux-2.6:
  vga_switcheroo: initial implementation (v15)
  fb: for framebuffer handover don't exit the loop early.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/radeon/Makefile
	drivers/gpu/drm/radeon/radeon.h
---

1c62233508ef7104f8a78e571fdf5c72d0dc0200
Reading git-diff-tree failed