Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel...
authorAlex Williamson <alex.williamson@redhat.com>
Fri, 6 Dec 2013 21:32:15 +0000 (14:32 -0700)
committerAlex Williamson <alex.williamson@redhat.com>
Fri, 6 Dec 2013 21:32:15 +0000 (14:32 -0700)

Trivial merge