tree 0deea7b61c163e6997a4634ab4ee310014984688
parent d927d505c59a0c7353343174e6225c43c61fba6d
parent db5a7a65c05867cb6ff5cb6d556a0edfce631d2d
author Roland Dreier <roland@purestorage.com> 1331594728 -0700
committer Roland Dreier <roland@purestorage.com> 1331594728 -0700

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