git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f39992
27cdef6
)
Merge branch 'ip-roce' into for-next
author
Roland Dreier
<roland@purestorage.com>
Thu, 23 Jan 2014 07:24:21 +0000
(23:24 -0800)
committer
Roland Dreier
<roland@purestorage.com>
Thu, 23 Jan 2014 07:24:21 +0000
(23:24 -0800)
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff