git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c691b3
7a3ae2f
)
Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus
author
Chris Mason
<chris.mason@oracle.com>
Thu, 29 Mar 2012 00:33:40 +0000
(20:33 -0400)
committer
Chris Mason
<chris.mason@oracle.com>
Thu, 29 Mar 2012 00:33:40 +0000
(20:33 -0400)
Conflicts:
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff