projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9118837 09c6268)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Nov 2014 17:46:15 +0000 (09:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Nov 2014 17:46:15 +0000 (09:46 -0800)
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()


Trivial merge
John Crispins staging tree