]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Wed, 9 Dec 2015 21:56:42 +0000 (13:56 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Wed, 9 Dec 2015 21:56:42 +0000 (13:56 -0800)
* '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

1  2 
mm/hugetlb.c

diff --cc mm/hugetlb.c
Simple merge