Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm...
authorJoerg Roedel <joro@8bytes.org>
Tue, 19 Feb 2013 14:45:17 +0000 (15:45 +0100)
committerJoerg Roedel <joro@8bytes.org>
Tue, 19 Feb 2013 14:45:17 +0000 (15:45 +0100)
commit604542b824f72fa5d7fd977af277538c1e15b5f0
tree16e35cc551b55d938ceb612dcd6162ebc3b05888
parent19f949f52599ba7c3f67a5897ac6be14bfcb1200
parent693567125bde1966a095267a9d8ca1b8d40f59ee
parent0af125ca06afbf279c45dc5a57ec35247b35e0e2
parent573f4145024598990d7191523f86a6d5233be751
parentf671e0224a7f6432abdd9935bc34d959f5a67e21
parent77e383504791008cdbab1b33d70b395ca3a361c8
parent37a407101e08e444a193837a1e1d4f6f66c8dad4
parent91457df7733564015f846c501424610318a5b85f
Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm/exynos', 'x86/vt-d' and 'x86/amd' into next
arch/arm/mach-exynos/Kconfig
drivers/iommu/Kconfig