www.infradead.org Git - users/hch/dma-mapping.git/commitdiff

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Fri, 15 Feb 2008 05:23:19 +0000 (21:23 -0800)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Fri, 15 Feb 2008 05:23:19 +0000 (21:23 -0800)

* 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()

		1	2
mm/memory.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge