summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-13 00:56:33 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-13 00:56:33 +0100
commit87aa08b7fee79dac908c80f7593007243448ef89 (patch)
tree0fce69996e4be3cfce35300831584a76a4ff1519 /include
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff)
parent[WATCHDOG] Pika Warp appliance watchdog timer (diff)
downloadlinux-87aa08b7fee79dac908c80f7593007243448ef89.tar.xz
linux-87aa08b7fee79dac908c80f7593007243448ef89.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] Pika Warp appliance watchdog timer [WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610 [WATCHDOG] Basic support for GE Fanuc's FPGA based watchdog timer [WATCHDOG] wm8350: Fix section annotations
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions