Joerg Roedel 8ce44a2174 Linux 3.5-rc7 ...

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQAfWKAAoJEHm+PkMAQRiG/DwIAIullMhkDhD/GJcn24ZbUJoa
 v6zRPK2hIavuKH/6bUoUiXT346PUYgVnRMhetuYKJFURz6KX/nmlxve/iXNn/WP1
 9hnxhE+zcnp2qKI83c3Yok09eed1KnGY5hWQkqXM2gzji/OU0pCKchOcL01l//uz
 iiWpNAXEVUnT92CafnHlZ55f/MWVqRFmDKi3Ty1YKSskhojQ6NOPsWCxrTxKVbim
 2YPXc3D+xLHzF12ufVgla20AF4KnK8m+tFugniRAqArIagpzBUP1x1wk0RN5PyBD
 FTP8lv7bSfBusp41/mPDB66WAe9EfQBoWQY6jloJjp0i8xnMyH5V05pImBV5NwU=
 =O+gl
 -----END PGP SIGNATURE-----

Merge tag 'v3.5-rc7' into arm/tegra

This solves the merge conflicts while creating the next
branch.

Linux 3.5-rc7

Conflicts:
	drivers/iommu/tegra-smmu.c

2012-07-17 12:04:20 +02:00

..

amd_iommu_init.c

iommu/amd: fix type bug in flush code

2012-07-02 12:11:40 +02:00

amd_iommu_proto.h

iommu/amd: Add function to get IOMMUv2 domain for pdev

2011-12-12 15:19:05 +01:00

amd_iommu_types.h

iommu/amd: fix type bug in flush code

2012-07-02 12:11:40 +02:00

amd_iommu_v2.c

iommu/amd: Don't initialize IOMMUv2 resources when not required

2012-03-15 12:46:40 +01:00

amd_iommu.c

iommu/amd: fix type bug in flush code

2012-07-02 12:11:40 +02:00

dmar.c

iommu: Fix off by one in dmar_get_fault_reason()

2012-05-14 14:37:47 +02:00

exynos-iommu.c

iommu/exynos: Add iommu driver for EXYNOS Platforms

2012-05-12 05:56:09 +09:00

intel_irq_remapping.c

irq_remap: Fix the 'sub_handle' uninitialized warning

2012-05-08 11:17:30 +02:00

intel-iommu.c

intel-iommu: Move duplicate list-mangling code into unlink_domain_info() helper

2012-05-25 15:50:29 -07:00

iommu.c

iommu/core: pass a user-provided token to fault handlers

2012-05-22 18:08:08 +02:00

iova.c

x86/ia64: intel-iommu: move to drivers/iommu/

2011-06-21 10:49:30 +02:00

irq_remapping.c

irq_remap: Fix UP build failure

2012-05-08 11:17:30 +02:00

irq_remapping.h

irq_remap: Fix UP build failure

2012-05-08 11:17:30 +02:00

Kconfig

iommu/tegra: smmu: Add device tree support for SMMU

2012-06-25 13:50:43 +02:00

Makefile

iommu: Add DMA window parser, of_get_dma_window()

2012-06-25 13:50:28 +02:00

msm_iommu_dev.c

…

msm_iommu.c

iommu/msm: Fix error handling in msm_iommu_unmap()

2012-01-30 12:53:14 +01:00

of_iommu.c

iommu: Add DMA window parser, of_get_dma_window()

2012-06-25 13:50:28 +02:00

omap-iommu-debug.c

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

omap-iommu.c

iommu: OMAP: device detach on domain destroy

2012-04-19 15:07:23 +02:00

omap-iovmm.c

Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next

2012-01-09 13:04:05 +01:00

tegra-gart.c

iommu/tegra: gart: Fix register offset correctly

2012-05-11 11:42:05 +02:00

tegra-smmu.c

iommu/tegra: Don't call alloc_pdir with as->lock

2012-07-17 11:47:14 +02:00