| commit | 2aaa822984b97efd894d10d1e1382206ef0291a7 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Tue Feb 24 15:59:14 2009 -0800 |
| committer | H. Peter Anvin <hpa@zytor.com> | Tue Feb 24 16:01:17 2009 -0800 |
| tree | 1065b2363853588b2f826117634caf5a8e044e23 | |
| parent | be71b8553d0522aba535a815baaebb1f0bb9a9ec [diff] | |
| parent | 15d4fcd615989ed83fe848e6a3c7e9f0361cf0d0 [diff] |
Merge branch 'x86/defconfig' into x86/mce2 Conflicts (resolved): arch/x86/configs/x86_64_defconfig Signed-off-by: H. Peter Anvin <hpa@zytor.com>