The following commit has been merged in the linux branch: commit 7811a32407b971d9086c46403124f1453b95c430 Merge: c896a2e0d80bbd5731f76609625a0cb7c9864a44 02dd0a0613e0d84c7dd8315e3fe6204d005b7c79 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 08:10:26 2009 -0700

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, UV: Set DELIVERY_MODE=4 for vector=NMI_VECTOR in uv_hub_send_ipi() x86, UV: Fix and clean up bau code to use uv_gpa_to_pnode() x86: Don't print number of MCE banks for every CPU x86, UV: Fix information in __uv_hub_info structure x86: Document linker script ASSERT() quirk