From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Aug 2014 22:09:52 +0000 (-0700)
Subject: Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux
X-Git-Tag: v3.17-rc1~57
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=96784de59fb35077c2bb33c39328992b836d87d3;hp=-c

Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux

Pull SElinux fixes from Paul Moore:
 "Two small patches to fix a couple of build warnings in SELinux and
  NetLabel.  The patches are obvious enough that I don't think any
  additional explanation is necessary, but it basically boils down to
  the usual: I was stupid, and these patches fix some of the stupid.

  Both patches were posted earlier this week to the SELinux list, and
  that is where they sat as I didn't think there were noteworthy enough
  to go upstream at this point in time, but DaveM would rather see them
  upstream now so who am I to argue.  As the patches are both very
  small"

* 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux:
  selinux: remove unused variabled in the netport, netnode, and netif caches
  netlabel: fix the netlbl_catmap_setlong() dummy function
---

96784de59fb35077c2bb33c39328992b836d87d3