projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 776f2b7 000703f)
Merge remote branch 'korg/drm-nvidia-switch-fixes' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Mon, 9 May 2011 03:23:18 +0000 (13:23 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 9 May 2011 03:23:18 +0000 (13:23 +1000)
* 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.


Trivial merge
Domain: System / Kernel;