projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c09a350
fbf8176
)
Merge branch 'drm-switcheroo-fixes' into drm-testing
author
Dave Airlie
<airlied@redhat.com>
Tue, 1 Jun 2010 01:32:06 +0000
(11:32 +1000)
committer
Dave 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