From: Greg Kroah-Hartman Date: Mon, 23 Mar 2015 20:36:48 +0000 (+0100) Subject: Merge 4.0-rc5 into staging-testing X-Git-Tag: firefly_0821_release~176^2~1998^2~138^2~210 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=807dc0668e7af56a49cf360c2d12f9b04083ac47;p=firefly-linux-kernel-4.4.55.git Merge 4.0-rc5 into staging-testing We want the staging tree fixes that are upstream here as well to prevent merge conflicts from people trying to clean up code. Signed-off-by: Greg Kroah-Hartman --- 807dc0668e7af56a49cf360c2d12f9b04083ac47