]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu...
authorJoerg Roedel <joro@8bytes.org>
Tue, 7 Jan 2014 22:24:15 +0000 (23:24 +0100)
committerJoerg Roedel <joro@8bytes.org>
Tue, 7 Jan 2014 22:24:15 +0000 (23:24 +0100)
1  2  3  4  5  6  7  8 
include/linux/iommu.h

Simple merge