]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commitafed26d151ba90b08361d4af0223daa362136ebd
tree48d30084d3a895a030881a9bd33436d511e78730
parent6106611e15b036bccfb4cfc0ed8bf83aab3ee226
parentcc1e0f4f7ad95a9eb81e1904cb16068af226180d
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