Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2016 22:51:10 +0000 (15:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Sep 2016 22:51:10 +0000 (15:51 -0700)
commitdbd8805b0ad46f04cababea5d01f072142961411
tree6ac45a7687ba67362d8a39e5da032625fc2e11b1
parent9a2172a8d52cf14ce44e9cadd8c9df84cf832d75
parent37aa7271d9742b574763e5ce019bde9c49aa8bfe
Merge branch 'akpm' (patches from Andrew)

Merge more fixes from Andrew Morton:
 "Three fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  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()