]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'iommu/fixes' and 'arm/omap' into next
authorJoerg Roedel <joro@8bytes.org>
Wed, 16 Apr 2014 19:26:36 +0000 (21:26 +0200)
committerJoerg Roedel <joro@8bytes.org>
Wed, 16 Apr 2014 19:26:36 +0000 (21:26 +0200)

Trivial merge