android_kernel_motorola_sm6225/drivers/infiniband/hw
Roland Dreier 42872c7a5e 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
2012-03-12 16:25:28 -07:00
..
amso1100 IB: Use central enum for speed instead of hard-coded values 2012-03-05 09:25:16 -08:00
cxgb3 IB: Use central enum for speed instead of hard-coded values 2012-03-05 09:25:16 -08:00
cxgb4 IB: Use central enum for speed instead of hard-coded values 2012-03-05 09:25:16 -08:00
ehca IB: Use central enum for speed instead of hard-coded values 2012-03-05 09:25:16 -08:00
ipath IB/ipath: Calling PTR_ERR() on right variable in create_file() 2012-01-27 09:48:27 -08:00
mlx4 Merge branches 'misc' and 'mlx4' into for-next 2012-03-12 16:25:28 -07:00
mthca IB: Change CQE "csum_ok" field to a bit flag 2012-03-08 12:34:27 -08:00
nes IB: Use central enum for speed instead of hard-coded values 2012-03-05 09:25:16 -08:00
qib IB: Change CQE "csum_ok" field to a bit flag 2012-03-08 12:34:27 -08:00