From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Feb 2015 04:07:47 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
X-Git-Tag: v4.0-rc1~113
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=7184487f14eb7c2fcf8337bb16c6a63b6db1252e

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

Pull audit fix from Paul Moore:
 "Just one patch from the audit tree for v3.20, and a very minor one at
  that.

  The patch simply removes an old, unused field from the audit_krule
  structure, a private audit-only struct.  In audit related news, we did
  a proper overhaul of the audit pathname code and removed the nasty
  getname()/putname() hacks for audit, you should see those patches in
  Al's vfs tree if you haven't already.

  That's it for audit this time, let's hope for a quiet -rcX series"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: remove vestiges of vers_ops
---

7184487f14eb7c2fcf8337bb16c6a63b6db1252e