git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7585717
ed0ca14
)
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...
author
Chris Mason
<chris.mason@oracle.com>
Fri, 17 Jun 2011 18:16:13 +0000
(14:16 -0400)
committer
Chris Mason
<chris.mason@oracle.com>
Fri, 17 Jun 2011 18:16:13 +0000
(14:16 -0400)
Conflicts:
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff