diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:42:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:42:43 -0700 |
commit | 3f1ae223902834d81b54b5d333f9efca07ad656b (patch) | |
tree | dd03e325404fc03692ffd1cd9f4d83ad89584d69 /fs | |
parent | e2205a156f4dd727097f7f492bf03aa8920b0071 (diff) | |
parent | 36cbaa8777dd5a79cb56c2a3d7d56f0c80b2bab6 (diff) | |
download | blackbird-op-linux-3f1ae223902834d81b54b5d333f9efca07ad656b.tar.gz blackbird-op-linux-3f1ae223902834d81b54b5d333f9efca07ad656b.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] pcwd.c - fix open_allowed type.
[WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation
[WATCHDOG] fix watchdog/wdt285.c compilation
[WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation
[WATCHDOG] fix watchdog/shwdt.c compilation
[WATCHDOG] fix watchdog/txx9wdt.c compilation
[WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry
[WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions