]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:45:20 +0000 (09:45 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:45:20 +0000 (09:45 -0700)
commite4ad767eedd83eb67b5cffa5a2534d97558b8066
tree03631c4a879e808ec39ef7b79b945766df048c08
parente0be1d24c38eed94a8c28dc4b279015739416eb6
parent9c78e55a6e0efb22565deee873cfcd295600e68a
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
drivers/char/watchdog/Kconfig
drivers/char/watchdog/Makefile