From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Aug 2010 23:00:44 +0000 (-0700)
Subject: Merge branch 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9779714c8af09d57527f18d9aa2207dcc27a8687;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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
---

9779714c8af09d57527f18d9aa2207dcc27a8687