From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Nov 2009 19:29:10 +0000 (-0800)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0~6996
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=605f37504f3afb590bf852bae4da5af8e462688e;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, amd-ucode: Check UCODE_MAGIC before loading the container file
  x86: Fix error return sequence in __ioremap_caller()
  x86: Add Phoenix/MSC BIOSes to lowmem corruption list
---

605f37504f3afb590bf852bae4da5af8e462688e