Linus Torvalds 8237eb946a Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, microcode, AMD: Add microcode revision to /proc/cpuinfo
  x86, microcode: Correct microcode revision format
  coretemp: Get microcode revision from cpu_data
  x86, intel: Use c->microcode for Atom errata check
  x86, intel: Output microcode revision in /proc/cpuinfo
  x86, microcode: Don't request microcode from userspace unnecessarily

Fix up trivial conflicts in arch/x86/kernel/cpu/amd.c (conflict between
moving AMD BSP code to cpu_dev helper function and adding AMD microcode
revision to /proc/cpuinfo code)
2011-10-28 05:14:48 -07:00
..
2011-05-25 20:43:33 +02:00
2011-05-25 20:43:33 +02:00
2009-12-14 21:17:27 +01:00
2011-03-31 11:26:23 -03:00
2009-12-14 21:17:26 +01:00
2010-10-28 20:31:50 +02:00
2010-10-28 20:31:50 +02:00
2011-01-12 21:55:13 +01:00
2009-12-14 21:17:26 +01:00
2011-01-12 21:55:11 +01:00
2009-12-14 21:17:27 +01:00
2011-08-11 10:14:18 -07:00
2011-05-25 20:43:32 +02:00
2009-12-14 21:17:26 +01:00
2011-07-25 21:46:11 +02:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:27 +01:00
2009-12-14 21:17:26 +01:00
2011-01-18 12:22:54 -08:00
2011-07-28 00:17:35 -07:00
2011-03-14 22:39:11 -07:00
2009-12-14 21:17:26 +01:00
2011-07-25 21:46:09 +02:00
2011-07-25 21:46:09 +02:00
2011-07-26 16:49:47 -07:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:27 +01:00
2011-03-31 11:26:23 -03:00
2010-10-28 20:31:50 +02:00
2009-12-14 21:17:26 +01:00
2009-12-14 21:17:26 +01:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00