tree 71a46e791f5a522a4d1cec7c321fdbd2d0668a50
parent 71e4938012faff9b84916f5424dbf4dff8d1d09e
parent 25d1c37798cd298d726dfb114f0dcaa15824b138
author Greg Kroah-Hartman <greg@kroah.com> 1427271973 +0100
committer Greg Kroah-Hartman <greg@kroah.com> 1427271993 +0100

greybus: Merge branch 'es1-fixes' into master

Merge the es1 log file fixes into master.

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