]> git.proxmox.com Git - mirror_ubuntu-disco-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)
commita8cd2e5045688157479a654786b2c08ab85f4d8f
tree03631c4a879e808ec39ef7b79b945766df048c08
parent0160f53e427e9f1f6d19b898867c105406037b6f
parentc315b7e840a1f336ffefb21d3130f9799af2ecd6
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
drivers/char/watchdog/Kconfig
drivers/char/watchdog/Makefile