git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cfc442b
c319310
)
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
author
Chris Mason
<chris.mason@oracle.com>
Thu, 31 May 2012 20:50:28 +0000
(16:50 -0400)
committer
Chris Mason
<chris.mason@oracle.com>
Thu, 31 May 2012 20:49:53 +0000
(16:49 -0400)
Conflicts:
fs/btrfs/ulist.h
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff