diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-29 14:35:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-29 14:35:00 -0400 |
| commit | a7ccbcf3307022c48810eebd99aa8dba84f13caf (patch) | |
| tree | a078d06b9d9ceb45b4b26d1b69d47e1fa465a38e /fs/btrfs/disk-io.h | |
| parent | 51cd8e6ff265650e35e46b5bcbe2ee381a7a2877 (diff) | |
| parent | 3e5531caffcc07b67452c4a8170ffb4c2bd1c9b7 (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"This will fix a warning for watchdog-test.c and it will remove a
duplicate include of delay.h"
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: da9052: Remove duplicate inclusion of delay.h
watchdog: fix watchdog-test.c build warning
Diffstat (limited to 'fs/btrfs/disk-io.h')
0 files changed, 0 insertions, 0 deletions