| commit | 9df94499c443d59291d247046cf3381ca06c1d36 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@google.com> | Mon Jun 15 16:53:23 2015 -0700 |
| committer | Greg Kroah-Hartman <gregkh@google.com> | Mon Jun 15 16:53:23 2015 -0700 |
| tree | 8b52fcbe805185608a90a5eb9d29842cddf2657a | |
| parent | fc1a536e603f5e096ae82c1a4195af41f0f5ee99 [diff] | |
| parent | 4bc1389de9fcaaaf2f93e278f588858fb4fe2038 [diff] |
greybus: Merge branch alex into Alexandre This resolves a conflict with es2.c that I fixed up. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>