tree f9ff2222404da700c7bbe651ce63d4e1d6e9456f
parent c09a35028567ae2c11d627bf69134b87a3c0efae
parent fbf81762e385d3d45acad057b654d56972acf58c
author Dave Airlie <airlied@redhat.com> 1275355926 +1000
committer Dave Airlie <airlied@redhat.com> 1275355926 +1000

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