| commit | b30a72a7edfc64c8929104d5c2178aca489aa559 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Wed Aug 27 19:17:07 2008 -0700 |
| committer | H. Peter Anvin <hpa@zytor.com> | Wed Aug 27 19:17:07 2008 -0700 |
| tree | 2b26c155c318d08d946bd2d70cf815dcdb29a243 | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 [diff] | |
| parent | c1b362e3b4d331a63915b268a33207311a439d60 [diff] |
Merge branch 'x86/urgent' into x86/cpu Conflicts: arch/x86/kernel/cpu/cyrix.c