From: Linus Torvalds 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: http://git.samba.org/samba.git/?a=commitdiff_plain;h=c742b4bf7a180619831783dcdad6aec062587e54;p=sfrench%2Fcifs-2.6.git 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() --- c742b4bf7a180619831783dcdad6aec062587e54