Compare: 08b84f50cab2b9a9a4c7 vs f3b8436ad9a8ad36b3c9
| Description: | Fix minor merge conflict difference | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband |
|---|---|---|
| Date: | July 23, 2008, 1:08 a.m. | Jan. 18, 2009, 10:14 a.m. |
| Hash: | 08b84f50cab2b9a9a4c7822fe6211230d7179072 | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b |
| Branches: | galak | galak, linus, powerpc-fixes |
| Gitweb: | git.kernel.org | git.kernel.org |
| Progress: | 0% 13/0 | 0% 14/0 |
| Successful: | 53% 7/13 | 50% 7/14 |
| Previous: | e6a2a8e701a38ed1c324 (compare) | 5393f780277165f282a3 (compare) |
| Next: | 48a5bbac108bc291bff0 (compare) | 18e352e4a73465349711 (compare) |