git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1f0905e
1eafa6c
)
Merge branch 'for-linus' into raid56-experimental
author
Chris Mason
<chris.mason@fusionio.com>
Tue, 5 Feb 2013 15:04:03 +0000
(10:04 -0500)
committer
Chris Mason
<chris.mason@fusionio.com>
Tue, 5 Feb 2013 15:04:03 +0000
(10:04 -0500)
Conflicts:
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Trivial merge