From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2011 00:04:55 +0000 (-0700)
Subject: Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~18897
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e0b8df79ddb8955d2cce5e858972a9cfe763384;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'x86-uv-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, UV: Correct UV2 BAU destination timeout
  x86, UV: Correct failed topology memory leak
  x86, UV: Remove cpumask_t from the stack
  x86, UV: Rename hubmask to pnmask
  x86, UV: Correct reset_with_ipi()
  x86, UV: Allow for non-consecutive sockets
  x86, UV: Inline header file functions
  x86, UV: Fix smp_processor_id() use in a preemptable region
  x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
  x86, UV: Clean up uv_mmrs.h
---

3e0b8df79ddb8955d2cce5e858972a9cfe763384