From: Roland Dreier <roland@purestorage.com>
Date: Mon, 12 Mar 2012 23:25:28 +0000 (-0700)
Subject: Merge branches 'misc' and 'mlx4' into for-next
X-Git-Tag: v3.4-rc1~169^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42872c7a5ed8d3ed49f51cb783978ca50369c564;p=pandora-kernel.git

Merge branches 'misc' and 'mlx4' into for-next

Conflicts:
	drivers/infiniband/hw/mlx4/main.c
	drivers/net/ethernet/mellanox/mlx4/main.c
	include/linux/mlx4/device.h
---

42872c7a5ed8d3ed49f51cb783978ca50369c564
Reading git-diff-tree failed