diff options
| author | Patrick Daly <pdaly@codeaurora.org> | 2016-02-16 15:55:09 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:10:55 -0700 |
| commit | 86a828d8207435b6c2266c06ed6578c64b0afa9e (patch) | |
| tree | 43e0dc32d6b37692e7dea80dc18ed79e2613c1df /include/uapi/linux | |
| parent | 0ff886d8f4f98efa045f9d80fcef3832a56521ff (diff) | |
iommu: Sync files for kernel upgrade
Reset the following files:
arm-smmu.c
iommu.c
include/linux/iommu.h
include/trace/events/iommu.h
to the git merge base between 3.18 and 4.4:
b2776bf7149bddd1f4161f14f79520f17fc1d71d
Change-Id: I9aa58e08125e3a72d1e9742e26d4a6fab34b0ed5
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Diffstat (limited to 'include/uapi/linux')
0 files changed, 0 insertions, 0 deletions