From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Mar 2009 23:44:08 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.29-rc7~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c742b4bf7a180619831783dcdad6aec062587e54;p=karo-tx-linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: Fix a panic in selinux_netlbl_inode_permission()
---

c742b4bf7a180619831783dcdad6aec062587e54