git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8216ef8
e9bb7f1
)
Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...
author
Chris Mason
<chris.mason@oracle.com>
Fri, 29 Oct 2010 13:27:49 +0000
(09:27 -0400)
committer
Chris Mason
<chris.mason@oracle.com>
Fri, 29 Oct 2010 13:27:49 +0000
(09:27 -0400)
Conflicts:
fs/btrfs/extent-tree.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff