aboutsummaryrefslogtreecommitdiff
path: root/include/linux/watchdog.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:25:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:25:30 -0700
commit2cb14596a03036bb8b9d3c60f9c4dbdf3a745c76 (patch)
tree9bb4fbc01ff4506b4ae85d25d37536f49354597a /include/linux/watchdog.h
parenta9aa0e24f7ed5acf2e0e1799fb28daf928293ba1 (diff)
parent5bd982ed0f5ae73bfd9ff452b460a3b08108bfee (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: [PATCH] Added URI of "linux kernel development process" [PATCH] Kobject: possible cleanups [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled [PATCH] Kobject: fix build error [PATCH] Frame buffer: remove cmap sysfs interface
Diffstat (limited to 'include/linux/watchdog.h')
0 files changed, 0 insertions, 0 deletions