From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Aug 2014 16:09:48 +0000 (-0600)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~67
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=311bf6d1cbfc288ccd6e6480cbf104da2447b524;p=pandora-kernel.git

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

Pull seccomp fix from James Morris.

BUG(!spin_is_locked()) really doesn't work very well in UP
configurations without any actual spinlock state.  Which is very much
why we have that "assert_spin_lock()" function for this.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  seccomp: Replace BUG(!spin_is_locked()) with assert_spin_lock
---

311bf6d1cbfc288ccd6e6480cbf104da2447b524
Reading git-diff-tree failed