diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 10:55:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 10:55:41 -0800 |
| commit | 1c2948380b699dfdbb25a7de740392dd9e6f0613 (patch) | |
| tree | f1a9fc2903c0cc85b24dd2fb279f89597976670d /drivers/watchdog/omap_wdt.c | |
| parent | b2e448eca1a52fea181905845728ae00a138d84e (diff) | |
| parent | b871866e4aa3f44b10f0f0ce004cc4635c2e58a5 (diff) | |
Merge tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p changes from Eric Van Hensbergen:
"Included are a new cache model for support of mmap, and several
cleanups across the filesystem and networking portions of the code"
* tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: update documentation
9P: introduction of a new cache=mmap model.
net/9p: remove virtio default hack and set appropriate bits instead
9p: remove useless 'name' variable and assignment
9p: fix return value in case in v9fs_fid_xattr_set()
9p: remove useless variable and assignment
9p: remove useless assignment
9p: remove unused 'super_block' struct pointer
9p: remove never used return variable
9p: remove unused 'p9_fid' struct pointer
9p: remove unused 'p9_client' struct pointer
Diffstat (limited to 'drivers/watchdog/omap_wdt.c')
0 files changed, 0 insertions, 0 deletions