summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-05-30 14:18:16 -0400
committerDavid S. Miller <davem@davemloft.net>2017-05-30 14:18:16 -0400
commitb9565077ae6c8695e3668071b109aecfbf8537c3 (patch)
treeb0d0d87c2a170132285e016b5e443768b93151cf /net
parentf0d7ae95fff4ab444b8433f07afc4b077ef1a285 (diff)
parent177567580aa1c3ec6e900b25280a52f02f93469f (diff)
downloadlinux-stable-b9565077ae6c8695e3668071b109aecfbf8537c3.tar.gz
linux-stable-b9565077ae6c8695e3668071b109aecfbf8537c3.tar.bz2
linux-stable-b9565077ae6c8695e3668071b109aecfbf8537c3.zip
Merge branch 'mlx4-mlx5-MAINTAINERS-update'
Tariq Toukan says: ==================== MAINTAINERS updates This patchset contains updates to the MAINTAINERS file. In the first patch, I replace Yishai as the maintainer of the mlx4_core driver. In the other two patches we move an RDMA header file from the list of the mlx4/mlx5 core driver into the respective IB driver, where it belongs. Series generated against net commit: 468b0df61a51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions