Merge branch 'drm-kdb-next' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Wed, 6 Oct 2010 02:57:50 +0000 (12:57 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 6 Oct 2010 02:57:50 +0000 (12:57 +1000)
commit96a03fce54af40b4f0820cd729608bc32c9b8949
tree91fbbaaacba4fe8562c5544460e99f3b09122e85
parent0c8eb0dc65f5a78b252eeff6c729ba4741390e23
parenta424d761a00c0233cb7734a8cd572ecd6d0362aa
Merge branch 'drm-kdb-next' into drm-core-next

* drm-kdb-next:
  drm/nouveau/kms: Avoid a hang entering KDB with VT accel on.
  radeon, kdb, kms: Save and restore the LUT on atomic KMS enter/exit
  drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API
  drm/nouveau/kms: Implement KDB debug hooks for nouveau KMS.
  drm/radeon/kms: Implement KDB debug hooks for radeon KMS.
drivers/gpu/drm/nouveau/nv04_crtc.c
drivers/gpu/drm/nouveau/nv50_crtc.c