projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6106611
cc1e0f4
)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:30:02 +0000
(14:30 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 6 Oct 2008 21:30:02 +0000
(14:30 -0700)
* '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
Trivial merge