diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 16:01:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 16:01:52 +0200 |
| commit | c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2 (patch) | |
| tree | 00aff822e9208ab2f2ac41c6e1a0f61c6eb9b57f /arch/mips/kernel/binfmt_elfn32.c | |
| parent | Revert "iommu: Allow iova to be used without requiring IOMMU_SUPPORT" (diff) | |
| parent | Linux 4.3-rc4 (diff) | |
| download | linux-c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2.tar.xz linux-c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2.zip | |
Merge 4.3-rc4 into char-misc-next
This is needed due to the duplicated iommu stuff to help with the merge
and to prevent future issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/kernel/binfmt_elfn32.c')
0 files changed, 0 insertions, 0 deletions