git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7bdb0d1
d4396ea
)
Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into...
author
Joel Becker
<joel.becker@oracle.com>
Fri, 15 Oct 2010 20:03:09 +0000
(13:03 -0700)
committer
Joel Becker
<joel.becker@oracle.com>
Fri, 15 Oct 2010 20:03:09 +0000
(13:03 -0700)
Conflicts:
fs/ocfs2/ocfs2.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff