git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
19f949f
272d26d
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...
author
Chris Mason
<chris.mason@fusionio.com>
Wed, 20 Feb 2013 19:05:45 +0000
(14:05 -0500)
committer
Chris Mason
<chris.mason@fusionio.com>
Wed, 20 Feb 2013 19:05:45 +0000
(14:05 -0500)
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/disk-io.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff