From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 15 Feb 2008 05:23:19 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Tag: v3.12-rc1~22805
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=664a1566df81b44f7e5e234d55e3bc8c6c0be211;p=kernel%2Fkernel-generic.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: cpa, fix out of date comment
  KVM is not seen under X86 config with latest git (32 bit compile)
  x86: cpa: ensure page alignment
  x86: include proper prototypes for rodata_test
  x86: fix gart_iommu_init()
  x86: EFI set_memory_x()/set_memory_uc() fixes
  x86: make dump_pagetable() static
  x86: fix "BUG: sleeping function called from invalid context" in print_vma_addr()
---

664a1566df81b44f7e5e234d55e3bc8c6c0be211