summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2013-02-19 15:45:17 +0100
committerJoerg Roedel <joro@8bytes.org>2013-02-19 15:45:17 +0100
commit604542b824f72fa5d7fd977af277538c1e15b5f0 (patch)
tree16e35cc551b55d938ceb612dcd6162ebc3b05888
parent19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff)
parent693567125bde1966a095267a9d8ca1b8d40f59ee (diff)
parent0af125ca06afbf279c45dc5a57ec35247b35e0e2 (diff)
parent573f4145024598990d7191523f86a6d5233be751 (diff)
parentf671e0224a7f6432abdd9935bc34d959f5a67e21 (diff)
parent77e383504791008cdbab1b33d70b395ca3a361c8 (diff)
parent37a407101e08e444a193837a1e1d4f6f66c8dad4 (diff)
parent91457df7733564015f846c501424610318a5b85f (diff)
Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm/exynos', 'x86/vt-d' and 'x86/amd' into next