| commit | 42872c7a5ed8d3ed49f51cb783978ca50369c564 | [log] [tgz] |
|---|---|---|
| author | Roland Dreier <roland@purestorage.com> | Mon Mar 12 16:25:28 2012 -0700 |
| committer | Roland Dreier <roland@purestorage.com> | Mon Mar 12 16:25:28 2012 -0700 |
| tree | 0deea7b61c163e6997a4634ab4ee310014984688 | |
| parent | d927d505c59a0c7353343174e6225c43c61fba6d [diff] | |
| parent | db5a7a65c05867cb6ff5cb6d556a0edfce631d2d [diff] |
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