From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 21:25:10 +0000 (-0800)
Subject: Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.33-rc1~375
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=343036cea2854acf8d4b4c930c0063223bc6b8a2;p=~emulex%2Finfiniband.git

Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: ucode-amd: Move family check to microcde_amd.c's init function
  x86, ucode-amd: Ensure ucode update on suspend/resume after CPU off/online cycle
  x86: ucode-amd: Convert printk(KERN_*...) to pr_*(...)
  x86: ucode-amd: Don't warn when no ucode is available for a CPU revision
  x86: ucode-amd: Load ucode-patches once and not separately of each CPU
  x86, amd-ucode: Remove needless log messages
---

343036cea2854acf8d4b4c930c0063223bc6b8a2