git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d927d50
db5a7a6
)
Merge branches 'misc' and 'mlx4' into for-next
author
Roland Dreier
<roland@purestorage.com>
Mon, 12 Mar 2012 23:25:28 +0000
(16:25 -0700)
committer
Roland Dreier
<roland@purestorage.com>
Mon, 12 Mar 2012 23:25:28 +0000
(16:25 -0700)
Conflicts:
drivers/infiniband/hw/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/main.c
include/linux/mlx4/device.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff