From: Greg Kroah-Hartman Date: Mon, 8 Jun 2015 17:34:44 +0000 (-0700) Subject: Merge 4.1-rc7 into staging-testing X-Git-Tag: firefly_0821_release~176^2~1545^2~362 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6394d6d01bf0881823522f37601cbf880bc61087;p=firefly-linux-kernel-4.4.55.git Merge 4.1-rc7 into staging-testing We want the staging tree fixes in here too to help with testing and merge issues. Signed-off-by: Greg Kroah-Hartman --- 6394d6d01bf0881823522f37601cbf880bc61087