From: Greg Kroah-Hartman <greg@kroah.com>
Date: Wed, 25 Mar 2015 08:26:13 +0000 (+0100)
Subject: greybus: Merge branch 'es1-fixes' into master
X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~1651
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=938451f184982a9a1b3a4daa3006ac5163020b35;p=users%2Fjedix%2Flinux-maple.git

greybus: Merge branch 'es1-fixes' into master

Merge the es1 log file fixes into master.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
---

938451f184982a9a1b3a4daa3006ac5163020b35