From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Dec 2014 21:41:28 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
X-Git-Tag: v3.19-rc1~91
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a99abce2d92dd21faffc9439fa35d1519627872b;p=linux-2.6-block.git

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

Pull audit updates from Paul Moore:
 "Two small patches from the audit next branch; only one of which has
  any real significant code changes, the other is simply a MAINTAINERS
  update for audit.

  The single code patch is pretty small and rather straightforward, it
  changes the audit "version" number reported to userspace from an
  integer to a bitmap which is used to indicate the functionality of the
  running kernel.  This really doesn't have much impact on the kernel,
  but it will make life easier for the audit userspace folks.

  Thankfully we were still on a version number which allowed us to do
  this without breaking userspace"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: convert status version to a feature bitmap
  audit: add Paul Moore to the MAINTAINERS entry
---

a99abce2d92dd21faffc9439fa35d1519627872b