From: Dave Airlie <airlied@redhat.com>
Date: Tue, 1 Jun 2010 01:32:06 +0000 (+1000)
Subject: Merge branch 'drm-switcheroo-fixes' into drm-testing
X-Git-Tag: v2.6.35-rc2~52^2~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=afa3b60c905f606e8245115474d77787035e02eb;p=karo-tx-linux.git

Merge branch 'drm-switcheroo-fixes' into drm-testing

* drm-switcheroo-fixes:
  drm/kms: disable/enable poll around switcheroo on/off
  drm/nouveau: fixup confusion over which handle the DSM is hanging off.
  drm/nouveau: attempt to get bios from ACPI v3
---

afa3b60c905f606e8245115474d77787035e02eb