]> git.neil.brown.name Git - history.git/commitdiff
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 30 Nov 2004 00:14:59 +0000 (16:14 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 30 Nov 2004 00:14:59 +0000 (16:14 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge