Merge remote-tracking branch 'infiniband/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 May 2014 01:47:55 +0000 (11:47 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 May 2014 01:47:55 +0000 (11:47 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:47:55 +0000 (11:47 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:47:55 +0000 (11:47 +1000)
diff --cc drivers/net/ethernet/mellanox/mlx5/core/mr.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 01:47:55 +0000 (11:47 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 01:47:55 +0000 (11:47 +1000)