| commit | bbd771474ec44b516107685d77e1c80bbe09f141 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Wed May 30 12:11:26 2012 -0700 |
| committer | H. Peter Anvin <hpa@zytor.com> | Wed May 30 12:11:32 2012 -0700 |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 | |
| parent | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 [diff] | |
| parent | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca [diff] |
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>