]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc08e03a5ef185b9c6b2c7517c74740f3627adbc5
tree91fbbaaacba4fe8562c5544460e99f3b09122e85
parent74d3540af019f09a76d6778d7601cd023c8bb2d6
parent6d344e2c0c581be11897d7f94d58ca3630e82ddc
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