git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d0ca30
4ea0288
)
Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers
author
Chris Mason
<chris.mason@oracle.com>
Sun, 22 May 2011 16:33:42 +0000
(12:33 -0400)
committer
Chris Mason
<chris.mason@oracle.com>
Sun, 22 May 2011 16:33:42 +0000
(12:33 -0400)
Conflicts:
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff