| commit | c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Oct 06 15:01:52 2015 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Oct 06 15:01:52 2015 +0100 |
| tree | 00aff822e9208ab2f2ac41c6e1a0f61c6eb9b57f | |
| parent | 1e1851f9d725ff9f00d74dfc4b73d47cba57466f [diff] | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 [diff] |
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>