greybus: Merge branch 'es1-fixes' into master
authorGreg Kroah-Hartman <greg@kroah.com>
Wed, 25 Mar 2015 08:26:13 +0000 (09:26 +0100)
committerGreg Kroah-Hartman <greg@kroah.com>
Wed, 25 Mar 2015 08:26:33 +0000 (09:26 +0100)
Merge the es1 log file fixes into master.

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

Trivial merge