Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 01:36:19 +0000 (18:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 01:36:19 +0000 (18:36 -0700)
commit392abeea52db4dc870c0ea41912df8ca60b27d44
treea2683db754940ea8fb5e4aa78aedbfe2b786b3a4
parent472db19ff5729cc9d054d6f87ba5147b21ec0787
parentbeed5336eba6a5a70c97e9f4bfff525915a25003
Merge branch 'for_linus' of git://git./linux/kernel/git/jwessel/linux-2.6-kgdb

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
  vt,console,kdb: preserve console_blanked while in kdb
  vt: fix regression warnings from KMS merge
  arm,kgdb: fix GDB_MAX_REGS no longer used
  kgdb: add missing __percpu markup in arch/x86/kernel/kgdb.c
  kdb: fix compile error without CONFIG_KALLSYMS