summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-03 21:36:56 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-03 21:36:56 +0200
commit7dfb1716d717e41c07410bab52760d865caee12b (patch)
treed5e62713d8712af8c9b356ce402a4fa9526a6cae /usr
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus... (diff)
parent[WATCHDOG] clean-up watchdog documentation (diff)
downloadlinux-7dfb1716d717e41c07410bab52760d865caee12b.tar.xz
linux-7dfb1716d717e41c07410bab52760d865caee12b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] clean-up watchdog documentation [WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions