git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b5f5914
ac05fbb
)
Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Al Viro
<viro@zeniv.linux.org.uk>
Fri, 21 Aug 2015 06:31:20 +0000
(
02:31
-0400)
committer
Al Viro
<viro@zeniv.linux.org.uk>
Fri, 21 Aug 2015 06:31:20 +0000
(
02:31
-0400)
Conflicts:
include/linux/fs.h
Trivial merge