summaryrefslogtreecommitdiff
path: root/arch/mips/math-emu/sp_tlong.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-11 19:30:50 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-11 19:30:50 +0300
commit5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b (patch)
treef43f81ab67d152c148bd3dfc1a0683d2c8306014 /arch/mips/math-emu/sp_tlong.c
parent148e45dc87cb76ba89e80da264bc692cc91a5149 (diff)
parentbf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff)
downloadlinux-5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b.tar.xz
Merge 4.6-rc3 into staging-next
This resolves a lot of merge issues with PAGE_CACHE_* changes, and an iio driver merge issue. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/math-emu/sp_tlong.c')
0 files changed, 0 insertions, 0 deletions