diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-12-22 22:03:15 (GMT) |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-12-22 22:03:15 (GMT) |
| commit | 882f3b3b916a01c703bf7516800a0dca741cd3e7 (patch) | |
| tree | 3a67f04a2b31985bb8044d39f0f5ebd9858658ae /drivers/net/mii.c | |
| parent | 182a2da0c768a9ec64abb0d6009667057f1c06af (diff) | |
| parent | c6333f9f9f7646e311248a09e8ed96126a97aba8 (diff) | |
| download | linux-882f3b3b916a01c703bf7516800a0dca741cd3e7.tar.xz | |
Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5
Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/iser/iser_verbs.c
Diffstat (limited to 'drivers/net/mii.c')
0 files changed, 0 insertions, 0 deletions