Merge branch 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 23:00:44 +0000 (16:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 23:00:44 +0000 (16:00 -0700)
commit9779714c8af09d57527f18d9aa2207dcc27a8687
tree52182f2289d9b7a77fbe119f4cd5726ef6494e66
parent89a6c8cb9e6e11b6e3671dce7e037789b8f7cf62
parent65b5ac1479840a3e87f086d68e5ef91f3002e8e2
Merge branch 'kms-merge' of git://git./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
Documentation/kernel-parameters.txt