]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2009 19:29:10 +0000 (11:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Nov 2009 19:29:10 +0000 (11:29 -0800)
commit605f37504f3afb590bf852bae4da5af8e462688e
tree63032ec80554fd50d97639d8380cfa962fc3a721
parent16fe4101ae265e908615702806ee3b28ab1c8370
parent506f90eeae682dc96c11c7aefac0262b3a560b49
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