David S. Miller
authored
Conflicts:
drivers/infiniband/hw/cxgb4/device.c
The cxgb4 conflict was simply overlapping changes.
Signed-off-by: 
David S. Miller <davem@davemloft.net> Code owners
Assign users and groups as approvers for specific file changes. Learn more.