Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek...

author Chuck Anderson <chuck.anderson@oracle.com>

Sat, 28 May 2016 17:55:28 +0000 (10:55 -0700)

committer Chuck Anderson <chuck.anderson@oracle.com>

Sat, 28 May 2016 17:55:28 +0000 (10:55 -0700)
author Chuck Anderson <chuck.anderson@oracle.com>
Sat, 28 May 2016 17:55:28 +0000 (10:55 -0700)
committer Chuck Anderson <chuck.anderson@oracle.com>
Sat, 28 May 2016 17:55:28 +0000 (10:55 -0700)
diff --cc drivers/infiniband/hw/mlx4/mcg.c
Simple merge
diff --cc drivers/infiniband/ulp/ipoib/ipoib_cm.c
Simple merge
diff --cc drivers/infiniband/ulp/ipoib/ipoib_ib.c
Simple merge
diff --cc drivers/infiniband/ulp/isert/ib_isert.c
Simple merge
author	Chuck Anderson <chuck.anderson@oracle.com>
	Sat, 28 May 2016 17:55:28 +0000 (10:55 -0700)
committer	Chuck Anderson <chuck.anderson@oracle.com>
	Sat, 28 May 2016 17:55:28 +0000 (10:55 -0700)
		1	2
drivers/infiniband/hw/mlx4/mcg.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_cm.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_ib.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/isert/ib_isert.c	patch \|	diff1 \|	diff2 \|	blob \| history