git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aa2dfb3
8628764
)
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs...
author
Chris Mason
<chris.mason@oracle.com>
Mon, 23 May 2011 10:30:52 +0000
(06:30 -0400)
committer
Chris Mason
<chris.mason@oracle.com>
Mon, 23 May 2011 10:30:52 +0000
(06:30 -0400)
Conflicts:
fs/btrfs/Makefile
fs/btrfs/ctree.h
fs/btrfs/volumes.h
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff