Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb:
  kgdb: always use icache flush for sw breakpoints
  kgdb: fix SMP NMI kgdb_handle_exception exit race
  kgdb: documentation fixes
  kgdb: allow static kgdbts boot configuration
  kgdb: add documentation
  kgdb: Kconfig fix
  kgdb: add kgdb internal test suite
  kgdb: fix several kgdb regressions
  kgdb: kgdboc pl011 I/O module
  kgdb: fix optional arch functions and probe_kernel_*
  kgdb: add x86 HW breakpoints
  kgdb: print breakpoint removed on exception
  kgdb: clocksource watchdog
  kgdb: fix NMI hangs
  kgdb: fix kgdboc dynamic module configuration
  kgdb: document parameters
  x86: kgdb support
  consoles: polling support, kgdboc
  kgdb: core
  uaccess: add probe_kernel_write()

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/setup64.c
Simple merge

diff --cc arch/x86/kernel/traps_32.c
index bb9107c56ff50451e91ec6f96661f84b94688e66,c5421f30d6788eeab97551eebae26f8ffe6aee43..65791ca2824a289651017fb524485746908a804e
--- 1/arch/x86/kernel/traps_32.c
--- 2/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@@ -728,14 -706,14 +728,16 @@@ io_check_error(unsigned char reason, st
  }
  
  static __kprobes void
 -unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
 +unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
  {
+       if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)
+               return;
  #ifdef CONFIG_MCA
 -      /* Might actually be able to figure out what the guilty party
 -      * is. */
 -      if( MCA_bus ) {
 +      /*
 +       * Might actually be able to figure out what the guilty party
 +       * is:
 +       */
 +      if (MCA_bus) {
                mca_handle_nmi();
                return;
        }

diff --cc arch/x86/kernel/traps_64.c
Simple merge

diff --cc include/asm-x86/kdebug.h
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc lib/Kconfig.debug
Simple merge