commit 9779714c8af09d57527f18d9aa2207dcc27a8687
author Linus Torvalds <torvalds@linux-foundation.org> Thu Aug 05 16:00:44 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Aug 05 16:00:44 2010 -0700
tree 52182f2289d9b7a77fbe119f4cd5726ef6494e66
parent 89a6c8cb9e6e11b6e3671dce7e037789b8f7cf62
parent 65b5ac1479840a3e87f086d68e5ef91f3002e8e2

Merge branch 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb

* 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
  kgdb,docs: Update the kgdb docs to include kms
  drm_fb_helper: Preserve capability to use atomic kms
  i915: when kgdb is active display compression should be off
  drm/i915: use new fb debug hooks
  drm: add KGDB/KDB support
  fb: add hooks to handle KDB enter/exit
  kgdboc: Add call backs to allow kernel mode switching
  vt,console,kdb: automatically set kdb LINES variable
  vt,console,kdb: implement atomic console enter/leave functions