diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-26 17:21:13 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-26 17:21:13 -0800 |
commit | d8e435f3ab6fea2ea324dce72b51dd7761747523 (patch) | |
tree | cb754f8e125e7dcfe40d3a17d035fa31e99d914b /drivers/net/macvlan.c | |
parent | e348031214d5dce67be93271433b27a93cba5b3f (diff) | |
parent | 8e54cadab447dae779f80f79c87cbeaea9594f60 (diff) | |
download | linux-d8e435f3ab6fea2ea324dce72b51dd7761747523.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs splice fix from Al Viro.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fix default_file_splice_read()
Diffstat (limited to 'drivers/net/macvlan.c')
0 files changed, 0 insertions, 0 deletions