]> git.baikalelectronics.ru Git - kernel.git/commit
Merge watchdog driver updates
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 13:00:45 +0000 (06:00 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 13:00:45 +0000 (06:00 -0700)
commitf776db2a425de2d8ee012f2192a3243cf1e4b589
tree872805a9402f8186584075f1a8cf804b9606efea
parentf56744662af40907faf555561d49d710e0224c15
parente2eefdb13e8cd9dd501950ac08c416f517a8c0b3
Merge watchdog driver updates

Automated merge from

master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.
drivers/char/watchdog/Makefile