projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 02c9c0e 6d0a07e)
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 May 2016 01:44:24 +0000 (18:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 May 2016 01:44:24 +0000 (18:44 -0700)
commita2ccb68b1e6add42c0bf3ade73cd11c98d32b890
tree03addb13529482fdc635ff7a916dd4e1c79ffbfbtree | snapshot (tar.gz zip)
parent02c9c0e9b9d9e26f56aa74245c1a5a843878f899commit | diff
parent6d0a07edd17cfc12fdc1f36de8072fa17cc3666fcommit | diff
Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
 "4 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: thp: calculate the mapcount correctly for THP pages during WP faults
  ksm: fix conflict between mmput and scan_get_next_rmap_item
  ocfs2: fix posix_acl_create deadlock
  ocfs2: revert using ocfs2_acl_chmod to avoid inode cluster lock hang