]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2c54396e40c79876a7ddfd3231c81eedf639795b
tree575a05d0965f3ffb407ff313deb3aa5988cbe5e3tree | snapshot
parent911883759fed56c32b97d73154039b5f8ffcba93commit | diff
parent09c626892772e6fe03f768b3492fbb126f465fe6commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()
Michael's Linux tree.