From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Jun 2014 17:58:28 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: omap-for-v3.16/fixes-rc4~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=894e552cfaa3389f934dc68180bac692aebcf26b;p=pandora-kernel.git

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

Pull security maintainership update from James Morris:
 "Add Serge Hallyn as security subsystem co-maintainer"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: add Serge Hallyn as a maintainer
---

894e552cfaa3389f934dc68180bac692aebcf26b
Reading git-diff-tree failed