]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'iommu/fixes' and 'arm/tegra' into next
authorJoerg Roedel <joerg.roedel@amd.com>
Fri, 10 Aug 2012 09:35:19 +0000 (11:35 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Fri, 10 Aug 2012 09:35:19 +0000 (11:35 +0200)
1  2 
drivers/iommu/tegra-smmu.c

Simple merge