summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-08-04 11:13:47 -0400
committerDoug Ledford <dledford@redhat.com>2016-08-04 11:13:47 -0400
commit7f1d25b47d919cef29388aff37e7b074e65bf512 (patch)
treef8d4308f423fa67e1d9ce15eb9a787fd51f8fb41 /include/uapi
parent6a89d89d85e4fa6f6f7281133ed97b2e7d0fe369 (diff)
parentab15c95a17b3fe8c0e01bb7ce1dd0b657598eb61 (diff)
parent8700e3e7c4857d28ebaa824509934556da0b3e76 (diff)
Merge branches 'misc' and 'rxe' into k.o/for-4.8-1