git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf8e8ca
fccb84c
)
Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
author
Chris Mason
<clm@fb.com>
Sat, 4 Oct 2014 16:56:45 +0000
(09:56 -0700)
committer
Chris Mason
<clm@fb.com>
Sat, 4 Oct 2014 16:56:45 +0000
(09:56 -0700)
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/extent_io.c
Trivial merge