From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 28 Apr 2014 04:38:34 +0000 (-0700)
Subject: Merge 3.15-rc3 into staging-next
X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~1117
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=37aa48368f2508defb1976be62e1ed6ca4dde683;p=firefly-linux-kernel-4.4.55.git

Merge 3.15-rc3 into staging-next
---

37aa48368f2508defb1976be62e1ed6ca4dde683