Merge branches 'misc' and 'rxe' into k.o/for-4.8-1

author Doug Ledford <dledford@redhat.com>

Thu, 4 Aug 2016 15:13:47 +0000 (11:13 -0400)

committer Doug Ledford <dledford@redhat.com>

Thu, 4 Aug 2016 15:13:47 +0000 (11:13 -0400)
author Doug Ledford <dledford@redhat.com>
Thu, 4 Aug 2016 15:13:47 +0000 (11:13 -0400)
committer Doug Ledford <dledford@redhat.com>
Thu, 4 Aug 2016 15:13:47 +0000 (11:13 -0400)
diff --cc drivers/infiniband/core/uverbs.h
Simple merge
diff --cc drivers/infiniband/core/uverbs_main.c
Simple merge
diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge
author	Doug Ledford <dledford@redhat.com>
	Thu, 4 Aug 2016 15:13:47 +0000 (11:13 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Thu, 4 Aug 2016 15:13:47 +0000 (11:13 -0400)
		1	2	3
drivers/infiniband/core/uverbs.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/infiniband/core/uverbs_main.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/infiniband/hw/mlx4/main.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history