]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:30:02 +0000 (14:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:30:02 +0000 (14:30 -0700)
commit765c9d91039b1dd00a4fb51ad0a4a19e1098a76f
tree48d30084d3a895a030881a9bd33436d511e78730
parent7a93dacacedd6eee5df97d91a1ca67b2a5a5cf11
parentd8daaba8bcfe7bda6e12de425ede8c600aead77f
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/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:
  kgdb: call touch_softlockup_watchdog on resume
  kgdb, x86: Avoid invoking kgdb_nmicallback twice per NMI