git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
45c448a
b76aabc
)
Merge branch 'mad' into for-linus
author
Roland Dreier
<rolandd@cisco.com>
Fri, 11 Sep 2009 04:19:45 +0000
(21:19 -0700)
committer
Roland Dreier
<rolandd@cisco.com>
Fri, 11 Sep 2009 04:19:45 +0000
(21:19 -0700)
Conflicts:
drivers/infiniband/core/mad.c
Trivial merge