| commit | dbd8805b0ad46f04cababea5d01f072142961411 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 30 15:51:10 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 30 15:51:10 2016 -0700 |
| tree | 6ac45a7687ba67362d8a39e5da032625fc2e11b1 | |
| parent | 9a2172a8d52cf14ce44e9cadd8c9df84cf832d75 [diff] | |
| parent | 37aa7271d9742b574763e5ce019bde9c49aa8bfe [diff] |
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()