• Linus Torvalds's avatar
    Merge tag 'for_linux-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb · d97e1dcd
    Linus Torvalds authored
    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
    d97e1dcd
ehci-dbgp.c 25.8 KB