summaryrefslogtreecommitdiff
path: root/net/hsr/hsr_netlink.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/hsr/hsr_netlink.h')
0 files changed, 0 insertions, 0 deletions
dfc0d212d366de9990a096665d5c0209a (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull fscache fixes from Al Viro. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fscache: Fix dead object requeue fscache: Clear outstanding writes when disabling a cookie FS-Cache: Initialise stores_lock in netfs cookie
Diffstat (limited to 'include')
-rw-r--r--include/linux/fscache-cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h