diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-03 09:59:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-03 09:59:51 -0800 |
| commit | d6d0972ae7e4306065e490a4b476042bd80f8b27 (patch) | |
| tree | 91ac8ccc3cbf0895f5299d34bf2de178ce9c004c /fs/ocfs2/acl.c | |
| parent | 03a6c2592f0020a43d0eb7d08010f2fa23c46fe7 (diff) | |
| parent | a17f4f032b61abd998a1f81b206a4517e2e3db2f (diff) | |
Merge tag 'linux-watchdog-4.16-fixes-1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
- rave-sp: add NVMEM dependency
- build fixes for i6300esb_wdt, xen_wdt and sp5100_tco
* tag 'linux-watchdog-4.16-fixes-1' of git://www.linux-watchdog.org/linux-watchdog:
watchdog: sp5100_tco.c: fix potential build failure
watchdog: xen_wdt: fix potential build failure
watchdog: i6300esb: fix build failure
watchdog: rave-sp: add NVMEM dependency
Diffstat (limited to 'fs/ocfs2/acl.c')
0 files changed, 0 insertions, 0 deletions