From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Feb 2015 00:20:49 +0000 (-0800)
Subject: Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve... 
X-Git-Tag: v4.0-rc1~139
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b2718bffb4088faf13092db30c1ebf088ddee52e;p=linux-2.6-block.git

Merge tag 'gfs2-merge-window' of git://git./linux/kernel/git/steve/gfs2-3.0-nmw

Pull gfs2 updates from Steven Whitehouse:
 "This time we have mostly clean ups.  There is a bug fix for a NULL
  dereference relating to ACLs, and another which improves (but does not
  fix entirely) an allocation fall-back code path.  The other three
  patches are small clean ups"

* tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
  GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()
  GFS2: use __vmalloc GFP_NOFS for fs-related allocations.
  GFS2: Eliminate a nonsense goto
  GFS2: fix sprintf format specifier
  GFS2: Eliminate __gfs2_glock_remove_from_lru
---

b2718bffb4088faf13092db30c1ebf088ddee52e