From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 6 Oct 2015 14:01:52 +0000 (+0100)
Subject: Merge 4.3-rc4 into char-misc-next
X-Git-Tag: firefly_0821_release~176^2~800^2~72
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2;p=firefly-linux-kernel-4.4.55.git

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>
---

c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2