summaryrefslogtreecommitdiff
path: root/include/scsi/iscsi_proto.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/scsi/iscsi_proto.h')
0 files changed, 0 insertions, 0 deletions
et/ipv6?id=f26e8817b235d8764363bffcc9cbfc61867371f2'>net/ipv6 parent2425f1808123bf69a8f66d4ec90e0d0e302c2613 (diff)parentebfb0184ef560897fad35005989e82433419202c (diff)
Merge branch 'next' into for-linus
Prepare input updates for 4.10 merge window.
Diffstat (limited to 'net/ipv6')