diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-03-21 17:32:23 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-03-21 17:32:23 -0400 |
| commit | 520a07bff6fbb23cac905007d74c67058b189acb (patch) | |
| tree | feef97d91e912f5028a469a417636363c9dd1650 /include/uapi | |
| parent | 34abf9ed73f2cf4fcc69eefd7e0af225cf9671a8 (diff) | |
| parent | 68996a6e760e5c74654723eeb57bf65628ae87f4 (diff) | |
| parent | 5511d7810752f426f0a9f999100fd249d352c2ef (diff) | |
Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6