projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
09cc926
c583b1f
)
Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk
author
Mark Brown
<broonie@kernel.org>
Fri, 21 Nov 2014 23:43:29 +0000
(23:43 +0000)
committer
Mark Brown
<broonie@kernel.org>
Fri, 21 Nov 2014 23:43:29 +0000
(23:43 +0000)
Conflicts:
drivers/mailbox/mailbox.c
include/linux/mailbox_controller.h
Trivial merge