Linux/linux dbd8805 — fs/ocfs2 aops.c, include/linux property.h swap.h
Merge branch 'akpm' (patches from Andrew) Merge more fixes from Andrew Morton: "Three fixes" * emailed patches from Andrew Morton <akpm at 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()
| Delta | File | |
|---|---|---|
| +57 | -57 | mm/filemap.c |
| +10 | -0 | fs/ocfs2/aops.c |
| +4 | -6 | mm/workingset.c |
| +1 | -1 | include/linux/property.h |
| +2 | -0 | include/linux/swap.h |
| +74 | -64 | 5 files |
