Merge ../linux-2.6-watchdog-mm
authorWim Van Sebroeck <wim@iguana.be>
Thu, 30 Nov 2006 19:22:09 +0000 (20:22 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Thu, 30 Nov 2006 19:22:09 +0000 (20:22 +0100)

Trivial merge