| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Jul 29 11:54:24 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Jul 29 11:54:24 2008 +0200 |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 [diff] | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 [diff] |
Merge commit 'v2.6.27-rc1' into x86/microcode Conflicts: arch/x86/kernel/microcode.c Manual resolutions: arch/x86/kernel/microcode_amd.c arch/x86/kernel/microcode_intel.c Signed-off-by: Ingo Molnar <mingo@elte.hu>