| commit | afed26d151ba90b08361d4af0223daa362136ebd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 06 14:30:02 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 06 14:30:02 2008 -0700 |
| tree | 48d30084d3a895a030881a9bd33436d511e78730 | |
| parent | 6106611e15b036bccfb4cfc0ed8bf83aab3ee226 [diff] | |
| parent | cc1e0f4f7ad95a9eb81e1904cb16068af226180d [diff] |
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