Merge branch 'linus' into core/iommu

Conflicts:
	arch/ia64/include/asm/dma-mapping.h
	arch/ia64/include/asm/machvec.h
	arch/ia64/include/asm/machvec_sn2.h
This commit is contained in:
Ingo Molnar 2009-01-16 10:09:10 +01:00
commit af2519fb22
841 changed files with 36244 additions and 10455 deletions

Some files were not shown because too many files have changed in this diff Show more