git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f577215
a265e55
)
Merge branch 'misc' into for-next
author
Roland Dreier
<rolandd@cisco.com>
Tue, 2 Mar 2010 07:52:31 +0000
(23:52 -0800)
committer
Roland Dreier
<rolandd@cisco.com>
Tue, 2 Mar 2010 07:52:31 +0000
(23:52 -0800)
Conflicts:
drivers/infiniband/core/uverbs_main.c
Trivial merge