git.openpandora.org / pandora-kernel.git / commitdiff
? search:
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...
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 21 Aug 2015 06:31:20 +0000 (02:31 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 21 Aug 2015 06:31:20 +0000 (02:31 -0400)
Conflicts:
include/linux/fs.h

1  2 
fs/super.c patch | diff1 | diff2 | blob | history
include/linux/fs.h patch | diff1 | diff2 | blob | history

diff --cc fs/super.c
Simple merge
diff --cc include/linux/fs.h
Simple merge
Pandora Kernel Repository