From: Greg Kroah-Hartman Date: Tue, 22 Apr 2014 17:08:40 +0000 (-0700) Subject: Merge 3.15-rc2 into staging-next X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~1357 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3eb9992caff10b62cf0ed0bcb1667a58b13188fa;p=firefly-linux-kernel-4.4.55.git Merge 3.15-rc2 into staging-next This resolves a bunch of merge errors with other fixes that are already in Linus's tree. Signed-off-by: Greg Kroah-Hartman --- 3eb9992caff10b62cf0ed0bcb1667a58b13188fa