From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 30 Oct 2007 04:44:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Tag: upstream/snapshot3+hdmi~29247
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4282b01e0075ac4495ab2e1cd012cbc43e764c51;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge git://git./linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86 boot: document for 32 bit boot protocol
  remove the dead X86_REMOTE_DEBUG option
  x86: merge EARLY_PRINTK options
  x86: mm/discontig_32.c: make code static
  x86: kernel/setup_32.c: unexport machine_id
  x86 gart: rename symbols only used for the GART implementation
  x86 gart: make some variables and functions static
  x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU
  x86 gart: rename iommu.h to gart.h
  x86: additional CPUID strings; fix strings for AMD-ecx
---

4282b01e0075ac4495ab2e1cd012cbc43e764c51