projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e1e21c b1b1e15)
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jan 2016 17:54:34 +0000 (09:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jan 2016 17:54:34 +0000 (09:54 -0800)
commit6fb11e6508eac9d2e01ba748fc13afdd657224ab
treebadf5fa97da02eab53826465ea9da21079eac0dctree | snapshot
parent3e1e21c7bfcfa9bf06c07f48a13faca2f62b3339commit | diff
parentb1b1e15ef6b80facf76d6757649dfd7295eda29fcommit | diff
Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "Six fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  ocfs2: NFS hangs in __ocfs2_cluster_lock due to race with ocfs2_unblock_lock
  reiserfs: fix dereference of ERR_PTR
  ratelimit: fix bug in time interval by resetting right begin time
  mm: fix kernel crash in khugepaged thread
  mm: fix mlock accouting
  thp: change pmd_trans_huge_lock() interface to return ptl
Unnamed repository; edit this file 'description' to name the repository.