summaryrefslogtreecommitdiff
path: root/drivers/iommu/iommu.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-30 13:50:27 +0100
committerMark Brown <broonie@kernel.org>2014-09-30 13:50:27 +0100
commita81bf3c4fc391ec10696d448408c1ac83bfb6112 (patch)
tree470b98d273eda27fd10f86e2a628dbc938b8c05b /drivers/iommu/iommu.c
parent95528a55dba0360b5342d9c7369e69a772717b7b (diff)
parentfdaff15ae6cc8745b9b56adab0252729b476ed7e (diff)
parentdf11e506d330d9a0e5a701cd2c5fcb7d461b6060 (diff)
parente13426bf249b4928ad914c9ddf7f8b7e5a93e1c6 (diff)
parent5c5e417bc06ff8d8b3214675f38f362567f0cd22 (diff)
parentba441ec225337a82d06a56a5a874a565564a88e0 (diff)
Merge remote-tracking branches 'regulator/topic/drivers', 'regulator/topic/enable', 'regulator/topic/fan53555', 'regulator/topic/hi6421' and 'regulator/topic/isl9305' into regulator-next