From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 19 Feb 2014 14:36:08 +0000 (-0800)
Subject: Merge branch 'char-misc-linus' into char-misc-next
X-Git-Tag: firefly_0821_release~176^2~4195^2~51
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0a191749ce19112f8f20675232b951dccd4ae00e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'char-misc-linus' into char-misc-next

We want the mei change here to allow future mei patches to apply
properly.

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

0a191749ce19112f8f20675232b951dccd4ae00e