summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-08-04 17:13:47 +0200
committerDoug Ledford <dledford@redhat.com>2016-08-04 17:13:47 +0200
commit7f1d25b47d919cef29388aff37e7b074e65bf512 (patch)
treef8d4308f423fa67e1d9ce15eb9a787fd51f8fb41 /include/uapi
parentMerge branch 'i40iw' into k.o/for-4.8 (diff)
parentIB/core: Support for CMA multicast join flags (diff)
parentSoft RoCE driver (diff)
downloadlinux-7f1d25b47d919cef29388aff37e7b074e65bf512.tar.xz
linux-7f1d25b47d919cef29388aff37e7b074e65bf512.zip
Merge branches 'misc' and 'rxe' into k.o/for-4.8-1