| commit | afa3b60c905f606e8245115474d77787035e02eb | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Jun 01 11:32:06 2010 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Jun 01 11:32:06 2010 +1000 |
| tree | f9ff2222404da700c7bbe651ce63d4e1d6e9456f | |
| parent | c09a35028567ae2c11d627bf69134b87a3c0efae [diff] | |
| parent | fbf81762e385d3d45acad057b654d56972acf58c [diff] |
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