Merge ../linux-2.6-watchdog-mm
authorWim Van Sebroeck <wim@iguana.be>
Fri, 9 Feb 2007 20:35:36 +0000 (21:35 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Fri, 9 Feb 2007 20:35:36 +0000 (21:35 +0100)

Trivial merge