summaryrefslogtreecommitdiffstats
path: root/fs/mpage.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-10 21:33:51 +0000
committerMark Brown <broonie@kernel.org>2017-11-10 21:33:51 +0000
commitabbdb5ce31c21a4b3c3922c56030f3d487497933 (patch)
treea37b493d2ddcb37852cb8aa9761b9a36fd9fae49 /fs/mpage.c
parent6e695472505f17658b41a63ea669f65a26506f38 (diff)
parent6ae6678344af52cf1c05475ff3ec2f43b8b532ef (diff)
parentda394712324e9a0c91ae05cc24396af6d99f3ad6 (diff)
parent54e2fc28d9cf1be7dd2ebe74b20dc20cc2a3e55d (diff)
parent979a9afe399f7c75e1be9f235fa8bf1a90d2e77d (diff)
downloadlinux-abbdb5ce31c21a4b3c3922c56030f3d487497933.tar.bz2
Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spreadtrum' and 'spi/topic/tegra114' into spi-next