From: Linus Torvalds Date: Fri, 30 Sep 2016 22:51:10 +0000 (-0700) Subject: Merge branch 'akpm' (patches from Andrew) X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dbd8805b0ad46f04cababea5d01f072142961411;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'akpm' (patches from Andrew) Merge more fixes from Andrew Morton: "Three fixes" * emailed patches from Andrew Morton : include/linux/property.h: fix typo/compile error ocfs2: fix deadlock on mmapped page in ocfs2_write_begin_nolock() mm: workingset: fix crash in shadow node shrinker caused by replace_page_cache_page() --- dbd8805b0ad46f04cababea5d01f072142961411