Merge ../linux-2.6-watchdog-mm
Wim Van Sebroeck [Tue, 13 Feb 2007 22:24:34 +0000 (23:24 +0100)]

Trivial merge