Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <joro@8bytes.org>
Mon, 30 Dec 2013 13:15:27 +0000 (14:15 +0100)
committerJoerg Roedel <joro@8bytes.org>
Mon, 30 Dec 2013 13:15:27 +0000 (14:15 +0100)

Trivial merge