projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a2172a 37aa727)
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)
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()


Trivial merge
Domain: System / Kernel;