From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 26 Nov 2015 04:08:58 +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~228
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2425c741a707cdc3035fcfdfd24f3c39ac572dc0;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:
  Revert "nfs: take extra reference to fl->fl_file when running a LOCKU operation"
---

2425c741a707cdc3035fcfdfd24f3c39ac572dc0