git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f3dea7e
f8f5701
)
Merge tag 'v3.5-rc1'
author
Sage Weil
<sage@inktank.com>
Fri, 15 Jun 2012 19:32:04 +0000
(12:32 -0700)
committer
Sage Weil
<sage@inktank.com>
Fri, 15 Jun 2012 19:32:04 +0000
(12:32 -0700)
Linux 3.5-rc1
Conflicts:
net/ceph/messenger.c
Trivial merge