summaryrefslogtreecommitdiffstats
path: root/net/wireless/scan.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2018-11-01 18:17:23 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2018-11-01 18:17:23 -0400
commit78a63f1235deb1ab9c0780b332d9cc18270247e2 (patch)
treeded7d7129a430b36b9a56528b395478aef37d14c /net/wireless/scan.c
parent3bf0fb6f33dd545693da5e65f5b1b9b9f0bfc35e (diff)
parent331bc71cb1751d78f6807ad8e6162b07c67cdd1b (diff)
downloadlinux-78a63f1235deb1ab9c0780b332d9cc18270247e2.tar.bz2
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 'net/wireless/scan.c')
0 files changed, 0 insertions, 0 deletions