From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Aug 2012 17:53:47 +0000 (-0700)
Subject: Merge tag 'for_linux-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwesse... 
X-Git-Tag: v3.6-rc2~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d97e1dcde5e19ed1f828baff4ab5fd0e517c8dae;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'for_linux-3.6-rc1' of git://git./linux/kernel/git/jwessel/kgdb

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

d97e1dcde5e19ed1f828baff4ab5fd0e517c8dae