OSDN Git Service

(root) / android-x86 / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc1a536 4bc1389)
greybus: Merge branch alex into Alexandre
authorGreg Kroah-Hartman <gregkh@google.com>
Mon, 15 Jun 2015 23:53:23 +0000 (16:53 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Mon, 15 Jun 2015 23:53:23 +0000 (16:53 -0700)
commit9df94499c443d59291d247046cf3381ca06c1d36
tree8b52fcbe805185608a90a5eb9d29842cddf2657atree | snapshot
parentfc1a536e603f5e096ae82c1a4195af41f0f5ee99commit | diff
parent4bc1389de9fcaaaf2f93e278f588858fb4fe2038commit | 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>
drivers/staging/greybus/es1.c diff1 | diff2 | blob | history
drivers/staging/greybus/es2.c diff1 | diff2 | blob | history
kernel
About OSDN
Find Software
Develop Software
Help