git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2c6b3e
0e4e026
)
Merge branch 'raid56-experimental' into for-linus-3.9
author
Chris Mason
<chris.mason@fusionio.com>
Wed, 20 Feb 2013 19:06:05 +0000
(14:06 -0500)
committer
Chris Mason
<chris.mason@fusionio.com>
Wed, 20 Feb 2013 19:06:05 +0000
(14:06 -0500)
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff