Merge branch 'k.o/for-4.6-rc' into testing/4.6

author Doug Ledford <dledford@redhat.com>

Thu, 28 Apr 2016 19:16:32 +0000 (15:16 -0400)

committer Doug Ledford <dledford@redhat.com>

Thu, 28 Apr 2016 19:16:32 +0000 (15:16 -0400)
author Doug Ledford <dledford@redhat.com>
Thu, 28 Apr 2016 19:16:32 +0000 (15:16 -0400)
committer Doug Ledford <dledford@redhat.com>
Thu, 28 Apr 2016 19:16:32 +0000 (15:16 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge
author	Doug Ledford <dledford@redhat.com>
	Thu, 28 Apr 2016 19:16:32 +0000 (15:16 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Thu, 28 Apr 2016 19:16:32 +0000 (15:16 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	patch \|	diff1 \|	diff2 \|	blob \| history