Olof Johansson 0f9cb211ba Linux 3.7-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQss0FAAoJEHm+PkMAQRiG6cEH/An3PYsWBBy27tzoLyVfJKF1 3m3vR8HS2tnHg6erxms+738jos59vrWXV0Ygnvw0DHbGR0HNb4rkwce/KXu/jgOD MRYNYhlhMFJTEUFrSrcwKITrAV3kVPWXxPXgAR6Gzpr6NPKKM9TBzEv0ze56TFYz asOxqeBcPSS7aFZlkoNsy1wG4l0Quo5ke8VZIxo9Me5qlqubAoZ6pING4wAGXqeE tf81CevSdpe0nqr8/dlYyCvLjrurgpJQczxRCBI3mP6kLWGfUCVzZmcu86PfT9b+ 35zNJwDneIoN+D9bVDHy6mrq9uQdmhWnQuhv1joTPn6RDn1nyBRBd+A5qLxSov4= =CPoy -----END PGP SIGNATURE----- Merge tag 'v3.7-rc7' into next/cleanup Merging in mainline back to next/cleanup since it has collected a few conflicts between fixes going upstream and some of the cleanup patches. Git doesn't auto-resolve some of them, and they're mostly noise so let's take care of it locally. Conflicts are in: arch/arm/mach-omap2/omap_hwmod_44xx_data.c arch/arm/plat-omap/i2c.c drivers/video/omap2/dss/dss.c Signed-off-by: Olof Johansson <olof@lixom.net>		2012-11-25 21:34:34 -08:00
..
amd_iommu_init.c	iommu/amd: Work around wrong IOAPIC device-id in IVRS table	2012-10-16 14:52:51 +02:00
amd_iommu_proto.h	iommu/amd: Add initialization routines for AMD interrupt remapping	2012-09-28 17:43:52 +02:00
amd_iommu_types.h	Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next	2012-10-02 14:40:03 +02:00
amd_iommu_v2.c	IOMMU Updates for Linux v3.6-rc1	2012-07-24 16:24:11 -07:00
amd_iommu.c	Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next	2012-10-02 14:40:03 +02:00
dmar.c
exynos-iommu.c	iommu/exynos: use list_del_init instead of list_del/INIT_LIST_HEAD	2012-09-18 12:44:02 +02:00
intel_irq_remapping.c	irq_remap: disable IRQ remapping if any IOAPIC lacks an IOMMU	2012-08-10 11:28:16 +02:00
intel-iommu.c	intel-iommu: Fix lookup in add device	2012-11-17 13:27:15 +01:00
iommu.c	Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next	2012-07-23 12:17:00 +02:00
iova.c	iommu: Fix typo in iommu	2012-07-24 12:58:49 +02:00
irq_remapping.c	iommu/irq: Use amd_iommu_irq_ops if supported	2012-09-28 17:43:53 +02:00
irq_remapping.h	iommu/amd: Add initialization routines for AMD interrupt remapping	2012-09-28 17:43:52 +02:00
Kconfig	iommu/amd: Check if IOAPIC information is correct	2012-09-28 17:31:09 +02:00
Makefile
msm_iommu_dev.c
msm_iommu.c
of_iommu.c
omap-iommu-debug.c
omap-iommu.c
omap-iovmm.c
tegra-gart.c	iommu/tegra: Implement DOMAIN_ATTR_GEOMETRY attribute	2012-07-11 12:25:57 +02:00
tegra-smmu.c	Linux 3.7-rc7	2012-11-25 21:34:34 -08:00