diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-10-18 13:12:09 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-10-18 13:12:09 -0400 |
| commit | 894b82c427d069a773e1d1417fe30bd31aa18801 (patch) | |
| tree | 8b361de9085f7891b4a673064b55f34b17bccb1e /drivers/firewire | |
| parent | 754137a769ac8f13cd6c0e1bc4fc2fa768d3da63 (diff) | |
| parent | a9346abed52f08e3e0ceb66d51f527ea11698d3c (diff) | |
| download | talos-obmc-linux-894b82c427d069a773e1d1417fe30bd31aa18801.tar.gz talos-obmc-linux-894b82c427d069a773e1d1417fe30bd31aa18801.zip | |
Merge branch 'timer_setup' into for-next
Conflicts:
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/qib/qib_driver.c
drivers/infiniband/hw/qib/qib_mad.c
There were minor fixups needed in these files. Just minor context diffs
due to patches from independent sources touching the same basic area.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/firewire')
0 files changed, 0 insertions, 0 deletions
