Merge branch 'k.o/for-4.6-rc' into testing/4.6
authorDoug Ledford <dledford@redhat.com>
Thu, 28 Apr 2016 19:16:32 +0000 (15:16 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 28 Apr 2016 19:16:32 +0000 (15:16 -0400)
1  2 
MAINTAINERS
drivers/infiniband/hw/mlx5/main.c

diff --cc MAINTAINERS
Simple merge
Simple merge