Merge http://linux-watchdog.bkbits.net/linux-2.5-watchdog
commit71670f8680ff82250bfdcb2df22e887a478e1024
authorLinus Torvalds <torvalds@home.osdl.org>
Thu, 31 Jul 2003 13:24:55 +0000 (31 06:24 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Thu, 31 Jul 2003 13:24:55 +0000 (31 06:24 -0700)
tree515e1755ef75c3c69ed337f2f552730f98734924
parent5e879a90f9f2df06eefbe294388dcedc98471928
parent34cdf699ff8e75911f8803e7e3537ecaa65e20f3
Merge linux-watchdog.bkbits.net/linux-2.5-watchdog
into home.osdl.org:/home/torvalds/v2.5/linux