Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next

Conflicts:
	drivers/iommu/Kconfig
	drivers/iommu/Makefile
This commit is contained in:
Joerg Roedel 2015-02-04 16:53:44 +01:00
255 changed files with 2783 additions and 1681 deletions