diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-23 08:34:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-23 08:34:59 +1000 |
| commit | d03330383c9255cdb184dd33594e89c3542f191b (patch) | |
| tree | 2b2e9676e5c0c7f365a68779cab7669ad009f48d /arch/alpha | |
| parent | 0537398b211b4f040564beec458e23571042d335 (diff) | |
| parent | 625db6b7e34580b750a13fd36a211a4366f6c3e2 (diff) | |
Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-core-next
* 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next:
drm/nouveau: fix earlier mistake when fixing merge conflict
drm/nvc0: fix thinko in instmem suspend/resume
drm/nouveau: Workaround missing GPIO tables on an Apple iMac G4 NV18.
drm/nouveau: Add TV-out quirk for an MSI nForce2 IGP.
drm/nv50-nvc0: ramht_size is meant to be in bytes, not entries
drm/nouveau: punt some more log messages to debug level
drm/nouveau: remove warning about unknown tmds table revisions
drm/nouveau: check for error when allocating/mapping dummy page
drm/nouveau: fix race condition when under memory pressure
drm/nv50: fix minor thinko from nvc0 changes
drm/nouveau: Don't try DDC on the dummy I2C channel.
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions