Merge bk://kernel.bkbits.net/jgarzik/pci-dma-mask-2.6

author Greg Kroah-Hartman <greg@kroah.com>

Fri, 26 Mar 2004 08:24:34 +0000 (00:24 -0800)

committer Greg Kroah-Hartman <greg@kroah.com>

Fri, 26 Mar 2004 08:24:34 +0000 (00:24 -0800)
author Greg Kroah-Hartman <greg@kroah.com>
Fri, 26 Mar 2004 08:24:34 +0000 (00:24 -0800)
committer Greg Kroah-Hartman <greg@kroah.com>
Fri, 26 Mar 2004 08:24:34 +0000 (00:24 -0800)
diff --cc Documentation/DMA-mapping.txt
Simple merge
diff --cc include/linux/pci.h
Simple merge
author	Greg Kroah-Hartman <greg@kroah.com>
	Fri, 26 Mar 2004 08:24:34 +0000 (00:24 -0800)
committer	Greg Kroah-Hartman <greg@kroah.com>
	Fri, 26 Mar 2004 08:24:34 +0000 (00:24 -0800)
		1	2
Documentation/DMA-mapping.txt	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history