From: Linus Torvalds Date: Mon, 6 Oct 2008 21:30:02 +0000 (-0700) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel... X-Git-Tag: v2.6.27-rc9~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=afed26d151ba90b08361d4af0223daa362136ebd;p=linux-2.6-omap-h63xx.git 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 --- afed26d151ba90b08361d4af0223daa362136ebd