From: Linus Torvalds <torvalds@linux-foundation.org>
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: v2.6.25-rc1~1229
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=69e4d4c3e1cb23fce81deeae08b502d27bad6993;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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