Merge branch 'omap-for-v3.8/cleanup-headers-iommu' of git://git.kernel.org/pub/scm...
authorJoerg Roedel <joro@8bytes.org>
Mon, 3 Dec 2012 17:40:59 +0000 (18:40 +0100)
committerJoerg Roedel <joro@8bytes.org>
Mon, 3 Dec 2012 17:40:59 +0000 (18:40 +0100)
commit18e170d03bcd17f5ccb35b271a95783f63145be7
tree5ce68cab628b93119d4c160efc6092e1ba6fa93e
parent9489e9dcae718d5fde988e4a684a0f55b5f94d17
parent2ab7c84815cffd5fe4946a472fc67fefa8ac3c29
Merge branch 'omap-for-v3.8/cleanup-headers-iommu' of git://git./linux/kernel/git/tmlind/linux-omap into arm/omap
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c