summaryrefslogtreecommitdiffstats
path: root/include/net/llc.h
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-12-14 20:56:21 +0100
committerDoug Ledford <dledford@redhat.com>2016-12-14 20:56:21 +0100
commit6f94ba20799b98c8badf047b184fb4cd7bc45e44 (patch)
tree41d55a0005cd2e0b27a110f3e70b342f9426f668 /include/net/llc.h
parentMerge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test (diff)
parentIB: Add vmw_pvrdma driver (diff)
downloadlinux-6f94ba20799b98c8badf047b184fb4cd7bc45e44.tar.xz
linux-6f94ba20799b98c8badf047b184fb4cd7bc45e44.zip
Merge branch 'vmw_pvrdma' into merge-test
Diffstat (limited to 'include/net/llc.h')
0 files changed, 0 insertions, 0 deletions