diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-11-02 01:17:23 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-11-02 01:17:23 +0300 |
| commit | 78a63f1235deb1ab9c0780b332d9cc18270247e2 (patch) | |
| tree | ded7d7129a430b36b9a56528b395478aef37d14c /include/linux/intel-iommu.h | |
| parent | 3bf0fb6f33dd545693da5e65f5b1b9b9f0bfc35e (diff) | |
| parent | 331bc71cb1751d78f6807ad8e6162b07c67cdd1b (diff) | |
| download | linux-78a63f1235deb1ab9c0780b332d9cc18270247e2.tar.xz | |
Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
backmerge to do fixup of iov_iter_kvec() conflict
Diffstat (limited to 'include/linux/intel-iommu.h')
0 files changed, 0 insertions, 0 deletions