Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu...
authorJoerg Roedel <joro@8bytes.org>
Thu, 9 Jan 2014 12:06:59 +0000 (13:06 +0100)
committerJoerg Roedel <joro@8bytes.org>
Thu, 9 Jan 2014 12:06:59 +0000 (13:06 +0100)

Trivial merge