Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

author David Woodhouse <[email protected]>

Tue, 8 Dec 2009 09:58:33 +0000 (09:58 +0000)

committer David Woodhouse <[email protected]>

Tue, 8 Dec 2009 09:59:24 +0000 (09:59 +0000)
author David Woodhouse <[email protected]>
Tue, 8 Dec 2009 09:58:33 +0000 (09:58 +0000)
committer David Woodhouse <[email protected]>
Tue, 8 Dec 2009 09:59:24 +0000 (09:59 +0000)
diff --cc drivers/pci/dmar.c
Simple merge
diff --cc drivers/pci/intel-iommu.c
Simple merge
author	David Woodhouse <[email protected]>
	Tue, 8 Dec 2009 09:58:33 +0000 (09:58 +0000)
committer	David Woodhouse <[email protected]>
	Tue, 8 Dec 2009 09:59:24 +0000 (09:59 +0000)
		1	2
drivers/pci/dmar.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/intel-iommu.c	patch \|	diff1 \|	diff2 \|	blob \| history