| commit | 7067552dfb382cef040326ab6dd0b8d642af3e64 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 19 09:18:29 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 19 09:18:29 2013 -0700 |
| tree | f09ff2a949007da4a976e37cbad43490a0904f81 | |
| parent | e91dade52b590d821e83bb494df20c93e5384790 [diff] | |
| parent | ccb1f55e710b78e1ea1de769bcab2d1e1abe8457 [diff] |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Ingo Molnar: "Two AMD microcode loader fixes and an OLPC firmware support fix" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, microcode, AMD: Fix early microcode loading x86, microcode, AMD: Make cpu_has_amd_erratum() use the correct struct cpuinfo_x86 x86: Don't clear olpc_ofw_header when sentinel is detected