diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:56:17 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-14 13:56:17 -0700 |
| commit | 794a90215c0166cfee281ce4e5b43e0275db3281 (patch) | |
| tree | dc60bd8adf520644e926f164832ce32732c5409b /drivers/iommu/amd_iommu_types.h | |
| parent | 1ed1294c420b2899ff69ec48bdf29fd1b79f374c (diff) | |
| parent | d2d481270a51545deb4ccc7c6646c9c2432c14da (diff) | |
Merge branch 'android-3.14' of /home/khilman/work/kernel/android/aosp into linux-linaro-lsk-v3.14-android
Conflicts:
drivers/staging/android/ion/ion_priv.h
Resolution: add/add conflict for include; misc whitespace conflicts
Diffstat (limited to 'drivers/iommu/amd_iommu_types.h')
0 files changed, 0 insertions, 0 deletions