From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Wed, 9 Dec 2015 21:56:42 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com... 
X-Git-Tag: v4.1.12-92~219
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=34afc68a70399c22bf4cba7a9c6d2e47a5e6c080;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  mm-hugetlb-resv-map-memory-leak-for-placeholder-entries-v2
  mm/hugetlb.c: fix resv map memory leak for placeholder entries
  Prevent syncing frozen file system
---

34afc68a70399c22bf4cba7a9c6d2e47a5e6c080