diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 19:11:26 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 19:11:32 (GMT) |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /drivers/infiniband | |
| parent | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (diff) | |
| parent | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca (diff) | |
| download | linux-fsl-qoriq-bbd771474ec44b516107685d77e1c80bbe09f141.tar.xz | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions