]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit24611db907bad15db2c922a70bb01855e1fa095c
tree6b6be1a7b9c152e27f12fba9d9d75cced9551b21
parent5935aec33934c574693176fdccf879c0dd275649
parent9911739813871631e3a6d220554c1ebffd09f5bf
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.