aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/dlm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-09 23:45:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-09 23:45:01 -0400
commitb690a3770e99497982d48a93e30cb7de549aead8 (patch)
tree9b31e9522e936440c0feaeb1e3b4ccd673804b45 /include/linux/dlm.h
parent016d3569bf7b21375451d91be6ee2ad4ffff5211 (diff)
parentcf1eaab2525e8ae1d53eaf923981c96cb31e57c8 (diff)
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] w83627hf_wdt.c: add support for the W83627EHF support [WATCHDOG] SA1100 watchdog maximum timeout [WATCHDOG] w83697ug, fix lock imbalance [WATCHDOG] drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons
Diffstat (limited to 'include/linux/dlm.h')
0 files changed, 0 insertions, 0 deletions