projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc4c3c8
29cf342
)
Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
author
Chris Mason
<clm@fb.com>
Wed, 25 Mar 2015 19:25:02 +0000
(12:25 -0700)
committer
Chris Mason
<clm@fb.com>
Wed, 25 Mar 2015 19:25:02 +0000
(12:25 -0700)
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/volumes.c
Trivial merge