diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-21 00:13:59 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-21 00:13:59 +0300 |
commit | e37b12e4bb21e7c81732370b0a2b34bd196f380b (patch) | |
tree | 7f0894d73040ed9a5e5a1f3fade9938cf3142a75 /net/wireless/trace.h | |
parent | 582888130702b86daa44ff6bfee585e4d4050ba0 (diff) | |
parent | c1048828c3dbd96c7e371fae658e5f40e6a45e99 (diff) | |
download | linux-e37b12e4bb21e7c81732370b0a2b34bd196f380b.tar.xz |
Merge tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs update from Mike Marshall:
"Add splice file operations"
* tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: add splice file operations
Diffstat (limited to 'net/wireless/trace.h')
0 files changed, 0 insertions, 0 deletions