From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Oct 2008 01:33:46 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.28-rc3~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=74c75f524ec5a48a00a8f01864a754c1d0e4a44b;p=linux-2.6-omap-h63xx.git

Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: cpu_index build fix
  x86/voyager: fix missing cpu_index initialisation
  x86/voyager: fix compile breakage caused by dc1e35c6e95e8923cf1d3510438b63c600fee1e2
  x86: fix /dev/mem mmap breakage when PAT is disabled
  x86/voyager: fix compile breakage casued by x86: move prefill_possible_map calling early
  x86: use CONFIG_X86_SMP instead of CONFIG_SMP
  x86/voyager: fix boot breakage caused by x86: boot secondary cpus through initial_code
  x86, uv: fix compile error in uv_hub.h
  i386/PAE: fix pud_page()
  x86: remove debug code from arch_add_memory()
  x86: start annotating early ioremap pointers with __iomem
  x86: two trivial sparse annotations
  x86: fix init_memory_mapping for [dc000000 - e0000000) - v2
---

74c75f524ec5a48a00a8f01864a754c1d0e4a44b