git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
27263e2
b367e47
)
Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration
author
Chris Mason
<chris.mason@oracle.com>
Mon, 16 Jan 2012 20:26:17 +0000
(15:26 -0500)
committer
Chris Mason
<chris.mason@oracle.com>
Mon, 16 Jan 2012 20:26:17 +0000
(15:26 -0500)
Conflicts:
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff