Merge 4.3-rc4 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 Oct 2015 14:01:52 +0000 (15:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 Oct 2015 14:01:52 +0000 (15:01 +0100)
commitc39b7eef7d92f5ffef1abf04227a62fa2a6a62b2
tree00aff822e9208ab2f2ac41c6e1a0f61c6eb9b57f
parent1e1851f9d725ff9f00d74dfc4b73d47cba57466f
parent049e6dde7e57f0054fdc49102e7ef4830c698b46
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>
MAINTAINERS