tree 4466a988d7dd9f0e08225cf6faca1cd6ab6d7dde
parent c19f83669a02d4fa047d0d40f518e90f6f19c4c6
parent 4ea3c51d5bd3bb4eea7d7d3a1f80d1a48c2a6f92
author Linus Torvalds <torvalds@linux-foundation.org> 1239925400 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239925400 -0700

Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: UV BAU distribution and payload MMRs
  x86: UV: BAU partition-relative distribution map
  x86, uv: add Kconfig dependency on NUMA for UV systems
  x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems
  x86, UV: Fix for nodes with memory and no cpus
  x86, UV: system table in bios accessed after unmap
  x86: UV BAU messaging timeouts
  x86: UV BAU and nodes with no memory