git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e3e1288
a269029
)
Merge branch 'next' into upstream-merge
author
Theodore Ts'o
<tytso@mit.edu>
Thu, 28 Oct 2010 03:44:47 +0000
(23:44 -0400)
committer
Theodore Ts'o
<tytso@mit.edu>
Thu, 28 Oct 2010 03:44:47 +0000
(23:44 -0400)
Conflicts:
fs/ext4/inode.c
fs/ext4/mballoc.c
include/trace/events/ext4.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff