diff options
| author |   Doug Ledford <dledford@redhat.com> | 2017-08-10 14:34:18 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-10 14:34:18 -0400 |
| commit | d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c (patch) | |
| tree | 8ce9d1f42907ff6b9455b155ca47ebae143f9a1b /include/linux/timerqueue.h | |
| parent | Merge branches '32bit_lid' and 'irq_affinity' into k.o/merge-test (diff) | |
| parent | Merge tag 'rdma-next-2017-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma into rdma-netlink (diff) | |
Merge branch 'rdma-netlink' into k.o/merge-test
Conflicts:
include/rdma/ib_verbs.h - Modified a function signature adjacent
to a newly added function signature from a previous merge
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions