git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9785dbd
21adbd5
)
Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs...
author
Chris Mason
<chris.mason@oracle.com>
Mon, 16 Jan 2012 20:27:58 +0000
(15:27 -0500)
committer
Chris Mason
<chris.mason@oracle.com>
Mon, 16 Jan 2012 20:27:58 +0000
(15:27 -0500)
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/super.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff