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

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

Wed, 19 Sep 2012 01:05:41 +0000 (11:05 +1000)

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

Wed, 19 Sep 2012 01:05:41 +0000 (11:05 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:05:41 +0000 (11:05 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:05:41 +0000 (11:05 +1000)
diff --cc drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Sep 2012 01:05:41 +0000 (11:05 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Sep 2012 01:05:41 +0000 (11:05 +1000)