]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f5bf69 b3dea13)
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 15 Jun 2004 12:05:37 +0000 (05:05 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 15 Jun 2004 12:05:37 +0000 (05:05 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge
Linux kernels and configurations used by Zygo.