diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 01:03:06 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 01:03:06 +0200 |
commit | fffcb480e4224f25c965b93fa65541bfc7dd732e (patch) | |
tree | a48383b5487798cdcc0153e342d6d88abe71333d /include/asm-arm/arch-ixp23xx/platform.h | |
parent | [PATCH] Fix plist include dependency (diff) | |
parent | [WATCHDOG] Documentation/watchdog update (diff) | |
download | linux-fffcb480e4224f25c965b93fa65541bfc7dd732e.tar.xz linux-fffcb480e4224f25c965b93fa65541bfc7dd732e.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] Documentation/watchdog update
[WATCHDOG] convert AT91RM9200 watchdog to platform driver
[WATCHDOG] add WDIOC_GETTIMELEFT ioctl
[WATCHDOG] Pre-Timeout flags
Diffstat (limited to 'include/asm-arm/arch-ixp23xx/platform.h')
0 files changed, 0 insertions, 0 deletions