You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 0cfdc72439 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu ... * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (33 commits) iommu/core: Remove global iommu_ops and register_iommu iommu/msm: Use bus_set_iommu instead of register_iommu iommu/omap: Use bus_set_iommu instead of register_iommu iommu/vt-d: Use bus_set_iommu instead of register_iommu iommu/amd: Use bus_set_iommu instead of register_iommu iommu/core: Use bus->iommu_ops in the iommu-api iommu/core: Convert iommu_found to iommu_present iommu/core: Add bus_type parameter to iommu_domain_alloc Driver core: Add iommu_ops to bus_type iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_API iommu/amd: Fix wrong shift direction iommu/omap: always provide iommu debug code iommu/core: let drivers know if an iommu fault handler isn't installed iommu/core: export iommu_set_fault_handler() iommu/omap: Fix build error with !IOMMU_SUPPORT iommu/omap: Migrate to the generic fault report mechanism iommu/core: Add fault reporting mechanism iommu/core: Use PAGE_SIZE instead of hard-coded value iommu/core: use the existing IS_ALIGNED macro iommu/msm: ->unmap() should return order of unmapped page ... Fixup trivial conflicts in drivers/iommu/Makefile: "move omap iommu to dedicated iommu folder" vs "Rename the DMAR and INTR_REMAP config options" just happened to touch lines next to each other.		13 years ago
..
common	[media] xc4000: make checkpatch.pl happy	14 years ago
dvb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	14 years ago
radio	Merge branch 'master' into for-next	14 years ago
rc	[media] nuvoton-cir: simplify raw IR sample handling	14 years ago
video	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	13 years ago
Kconfig	[media] DVB: dvb-net, make the kconfig text helpful	14 years ago
Makefile	[media] media: Entities, pads and links	14 years ago
media-device.c	[media] media: Links setup	14 years ago
media-devnode.c	[media] media: Fix media device minor registration	14 years ago
media-entity.c	[media] media: Properly handle link flags in link setup, link notify callback	14 years ago