diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-12-14 14:44:47 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-12-14 14:44:47 -0500 |
| commit | 9032ad78bb58f2567fc95125ee69cde7b74c0a21 (patch) | |
| tree | c92982d00aac2312e5c3a11d0ec7fbebab221fc3 /include/uapi | |
| parent | 86ef0beaa0bdbec70d4261977b8b4a100fe54bfe (diff) | |
| parent | 46d0703fac3ffa12ec36f22f386d96d0f474c9c2 (diff) | |
| parent | 22b1ae6169e3cb9e33ba549a0c07a0cc469143d7 (diff) | |
| parent | 512fb1b32bac02ebec50e5060f94dc1ad23ed28f (diff) | |
| parent | 37f69f43fb5aba4288d38ea32bbe0dfdb412c763 (diff) | |
| parent | 4fa354c9dbfef9226a690d8ee319b046f3067a6a (diff) | |
Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test