Doug Ledford 894b82c427 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>		2017-10-18 13:12:09 -04:00
..
mlx4	net/mlx4_core: Convert timers to use timer_setup()	2017-10-09 12:19:41 -04:00
mlx5/core	Merge branch 'for-next-early' into for-next	2017-10-18 13:07:13 -04:00
mlxfw	net/mlxfw: Properly handle dependancy with non-loadable mlx5	2017-07-03 02:32:25 -07:00
mlxsw	mlxsw: spectrum_router: Track RIF of IPIP next hops	2017-10-02 11:18:57 -07:00
Kconfig	Change Kconfig description	2017-08-14 11:18:16 -07:00
Makefile	Add the mlxfw module for Mellanox firmware flash process	2017-05-25 17:46:17 -04:00