commit 664a1566df81b44f7e5e234d55e3bc8c6c0be211
author Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Feb 14 21:23:19 2008 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Feb 14 21:23:19 2008 -0800
tree 17eb4b827091279a60f60a36b34e0437ba804dc1
parent b9e222904ce92e1b277f2b85411d1eb6bfe27410
parent f8d8406bcb58ff70e97b71c35ff5be90c54fc3d0

Merge git://git.kernel.org/pub/scm/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()