Merge remote branch 'korg/drm-nvidia-switch-fixes' into drm-core-next

* korg/drm-nvidia-switch-fixes:
  mxm/wmi: add MXMX interface entry point.
  nouveau: add optimus detection to DSM code.
  vgaarb: use bridges to control VGA routing where possible.
  nouveau/acpi: hook up to the MXM method for mux switching.
  platform/x86: add MXM WMI driver.
This commit is contained in:
Dave Airlie 2011-05-09 13:23:18 +10:00
commit 269dc2d919
9 changed files with 368 additions and 38 deletions