From: Linus Torvalds Date: Sun, 27 Jan 2008 06:43:56 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: firefly_0821_release~23722 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=69e4d4c3e1cb23fce81deeae08b502d27bad6993;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: selinux: fix labeling of /proc/net inodes --- 69e4d4c3e1cb23fce81deeae08b502d27bad6993