Merge tag 'for_linux-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwesse...

Pull KGDB/KDB/usb-dbgp fixes and cleanups from Jason Wessel:
 "There are no new features, those will be delayed to the 3.7 window.
  There are only fixes/cleanup against the usual kernel churn and we are
  removing more lines than we add:

   - usb-dbgp - increase the controller wait time to come out of halt.
   - kdb - Remove unused KDB_FLAG_ONLY_DO_DUMP code and cpu in more prompt
   - debug core - pass NMI type on archs that provide NMI types"

* tag 'for_linux-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
  USB: echi-dbgp: increase the controller wait time to come out of halt.
  kernel/debug: Make use of KGDB_REASON_NMI
  kdb: Remove cpu from the more prompt
  kdb: Remove unused KDB_FLAG_ONLY_DO_DUMP

diff --combined drivers/usb/early/ehci-dbgp.c
index ee0ebacf8227df070dc4a40daf8cd873007ca296,347bb058e1eeba2a161c7a528985bef51b84e221..89dcf155d57e9e75fec8919e120fe6fcaa4b0136
--- 1/drivers/usb/early/ehci-dbgp.c
--- 2/drivers/usb/early/ehci-dbgp.c
+++ b/drivers/usb/early/ehci-dbgp.c
@@@ -334,7 -334,7 +334,7 @@@ static int dbgp_control_msg(unsigned de
        int ret;
  
        read = (requesttype & USB_DIR_IN) != 0;
 -      if (size > (read ? DBGP_MAX_PACKET:0))
 +      if (size > (read ? DBGP_MAX_PACKET : 0))
                return -1;
  
        /* Compute the control message */
@@@ -450,7 -450,7 +450,7 @@@ static int dbgp_ehci_startup(void
        writel(FLAG_CF, &ehci_regs->configured_flag);
  
        /* Wait until the controller is no longer halted */
-       loop = 10;
+       loop = 1000;
        do {
                status = readl(&ehci_regs->status);
                if (!(status & STS_HALT))