review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fc1a536 4bc1389)

author	Greg Kroah-Hartman <gregkh@google.com>
	Mon, 15 Jun 2015 23:53:23 +0000 (16:53 -0700)
committer	Greg Kroah-Hartman <gregkh@google.com>
	Mon, 15 Jun 2015 23:53:23 +0000 (16:53 -0700)
commit	9df94499c443d59291d247046cf3381ca06c1d36
tree	8b52fcbe805185608a90a5eb9d29842cddf2657a	tree \| snapshot
parent	fc1a536e603f5e096ae82c1a4195af41f0f5ee99	commit \| diff
parent	4bc1389de9fcaaaf2f93e278f588858fb4fe2038	commit \| 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

Domain: System / Kernel;