Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 20 Oct 2008 19:16:53 +0000 (20:16 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 20 Oct 2008 19:19:36 +0000 (20:19 +0100)
commitb364776ad1208a71f0c53578c84619a395412a8d
treed6050e5db6298095324ccb8af7d477684485d52e
parent6da0b38f4433fb0f24615449d7966471b6e5eae0
parent6c8909b42fee1be67647bcd2518161a0fa8ca533
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/pci/intel-iommu.c
MAINTAINERS
drivers/pci/intel-iommu.c