]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c09a350 fbf8176)
Merge branch 'drm-switcheroo-fixes' into drm-testing
authorDave Airlie <airlied@redhat.com>
Tue, 1 Jun 2010 01:32:06 +0000 (11:32 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 1 Jun 2010 01:32:06 +0000 (11:32 +1000)
* drm-switcheroo-fixes:
  drm/kms: disable/enable poll around switcheroo on/off
  drm/nouveau: fixup confusion over which handle the DSM is hanging off.
  drm/nouveau: attempt to get bios from ACPI v3


Trivial merge
Linux kernel for KaRo TX COM modules