OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b86b64e 5b559e6)
greybus: Merge branch 'master' into svc
authorGreg Kroah-Hartman <gregkh@google.com>
Tue, 4 Aug 2015 03:06:10 +0000 (20:06 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Tue, 4 Aug 2015 03:06:10 +0000 (20:06 -0700)
commit7f69e5990f66818bd5bdb90a51df0cca2505c1bc
tree67b8ccc0ca3605bb04615f3373e17f8961d579d9tree | snapshot
parentb86b64e9a7a9d8fa6fec85dd85974d7b356b76c7commit | diff
parent5b559e64578783b944691f6f9e7c19812d2fced6commit | diff
greybus: Merge branch 'master' into svc

Handle some merge conflicts in greybus_protocols.h due to changes on the
same structure in both branches.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/greybus_protocols.h diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help