tree d6050e5db6298095324ccb8af7d477684485d52e
parent 6da0b38f4433fb0f24615449d7966471b6e5eae0
parent 6c8909b42fee1be67647bcd2518161a0fa8ca533
author David Woodhouse <David.Woodhouse@intel.com> 1224530213 +0100
committer David Woodhouse <David.Woodhouse@intel.com> 1224530376 +0100

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

Conflicts:

	drivers/pci/intel-iommu.c