From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 22 Apr 2014 17:08:40 +0000 (-0700)
Subject: Merge 3.15-rc2 into staging-next
X-Git-Tag: v5.15~17469^2~39^2~1357
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3eb9992caff10b62cf0ed0bcb1667a58b13188fa;p=platform%2Fkernel%2Flinux-starfive.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 <gregkh@linuxfoundation.org>
---

3eb9992caff10b62cf0ed0bcb1667a58b13188fa