commit | 605f37504f3afb590bf852bae4da5af8e462688e | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 11 11:29:10 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 11 11:29:10 2009 -0800 |
tree | 63032ec80554fd50d97639d8380cfa962fc3a721 | |
parent | 16fe4101ae265e908615702806ee3b28ab1c8370 [diff] | |
parent | 506f90eeae682dc96c11c7aefac0262b3a560b49 [diff] |
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