Merge branches 'misc' and 'mlx4' into for-next
authorRoland Dreier <roland@purestorage.com>
Mon, 12 Mar 2012 23:25:28 +0000 (16:25 -0700)
committerRoland Dreier <roland@purestorage.com>
Mon, 12 Mar 2012 23:25:28 +0000 (16:25 -0700)
commit42872c7a5ed8d3ed49f51cb783978ca50369c564
tree0deea7b61c163e6997a4634ab4ee310014984688
parentd927d505c59a0c7353343174e6225c43c61fba6d
parentdb5a7a65c05867cb6ff5cb6d556a0edfce631d2d
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
drivers/infiniband/hw/mlx4/cq.c
drivers/infiniband/hw/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/mellanox/mlx4/port.c
include/linux/mlx4/device.h