From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 Mar 2015 07:44:23 +0000 (+0100)
Subject: Merge 4.0-rc3 into char-misc-next
X-Git-Tag: firefly_0821_release~176^2~1906^2~77
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e94f16a4fde646b3f155788fe37339b61264b0a9;p=firefly-linux-kernel-4.4.55.git

Merge 4.0-rc3 into char-misc-next

We want the mei fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

e94f16a4fde646b3f155788fe37339b61264b0a9