From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 10 Nov 2014 03:24:26 +0000 (+0900)
Subject: Merge 3.18-rc4 into staging-next
X-Git-Tag: firefly_0821_release~176^2~2665^2~244
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6;p=firefly-linux-kernel-4.4.55.git

Merge 3.18-rc4 into staging-next

We want the staging fixes in here as well.

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

cc03f9bc2650634ce5ec0233f5ee12e6b67f74c6