From: Greg Kroah-Hartman Date: Tue, 22 Apr 2014 17:08:40 +0000 (-0700) Subject: Merge 3.15-rc2 into staging-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3eb9992caff10b62cf0ed0bcb1667a58b13188fa;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.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