Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2...
authorWim Van Sebroeck <wim@iguana.be>
Tue, 12 Dec 2006 22:48:41 +0000 (23:48 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Tue, 12 Dec 2006 22:48:41 +0000 (23:48 +0100)
commita57bf8a4f23cca2b5be5446649bbe22d1440af5d
treed568ec3dec15e4169e8058c321454afdb96d2791
parentd4b87598e940053fa22020dcdc6384827b4fc58d
parente0b79e0bc261ad320f6c218ac6823f7ca859171f
Merge branch 'master' of /linux/kernel/git/wim/linux-2.6-watchdog
drivers/char/watchdog/at91rm9200_wdt.c