Merge branch 'drm-switcheroo-fixes' into drm-testing
authorDave Airlie <airlied@redhat.com>
Tue, 1 Jun 2010 01:32:06 +0000 (11:32 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 1 Jun 2010 01:32:06 +0000 (11:32 +1000)
commitafa3b60c905f606e8245115474d77787035e02eb
treef9ff2222404da700c7bbe651ce63d4e1d6e9456f
parentc09a35028567ae2c11d627bf69134b87a3c0efae
parentfbf81762e385d3d45acad057b654d56972acf58c
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