From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Nov 2014 17:46:15 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c54396e40c79876a7ddfd3231c81eedf639795b;p=pandora-kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull SELinux fixlet from James Morris:
 "WARN_ONCE() here will unnecessarily terrify users"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: convert WARN_ONCE() to printk() in selinux_nlmsg_perm()
---

2c54396e40c79876a7ddfd3231c81eedf639795b