Skip to content
Commit 9df94499 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

greybus: Merge branch alex into Alexandre 



This resolves a conflict with es2.c that I fixed up.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fc1a536e 4bc1389d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment