From: Dave Airlie <airlied@redhat.com>
Date: Mon, 9 May 2011 03:23:18 +0000 (+1000)
Subject: Merge remote branch 'korg/drm-nvidia-switch-fixes' into drm-core-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=269dc2d9194f74b920647e0f2ed0d822dc431770;p=linux-beck.git

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.
---

269dc2d9194f74b920647e0f2ed0d822dc431770