Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Mar 2009 23:44:08 +0000 (15:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Mar 2009 23:44:08 +0000 (15:44 -0800)
commitc742b4bf7a180619831783dcdad6aec062587e54
treefea01d86c4da765bb7f8bf016c431e80a6aa14ce
parentfbfd8b5622a18afefb53a69d31fbddecba404f64
parentd7f59dc4642ce2fc7b79fcd4ec02ffce7f21eb02
Merge branch 'for-linus' of git://git./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()