Merge branch 'arm/smmu' into arm/renesas
authorJoerg Roedel <jroedel@suse.de>
Mon, 26 Jan 2015 12:42:49 +0000 (13:42 +0100)
committerJoerg Roedel <jroedel@suse.de>
Mon, 26 Jan 2015 12:42:49 +0000 (13:42 +0100)

Trivial merge