tree 6b6be1a7b9c152e27f12fba9d9d75cced9551b21
parent 776f2b7cb473baa52cdeee9804073342dee7d7cb
parent 000703f44c77b152cd966eaf06f4ab043274ff46
author Dave Airlie <airlied@redhat.com> 1304911398 +1000
committer Dave Airlie <airlied@redhat.com> 1304911398 +1000

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.