Merge ../linux-2.6-watchdog-mm
authorWim Van Sebroeck <wim@iguana.be>
Tue, 13 Feb 2007 22:24:34 +0000 (23:24 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Tue, 13 Feb 2007 22:24:34 +0000 (23:24 +0100)

Trivial merge