tree 63032ec80554fd50d97639d8380cfa962fc3a721
parent 16fe4101ae265e908615702806ee3b28ab1c8370
parent 506f90eeae682dc96c11c7aefac0262b3a560b49
author Linus Torvalds <torvalds@linux-foundation.org> 1257967750 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257967750 -0800

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/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