Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jan 2008 06:43:56 +0000 (22:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jan 2008 06:43:56 +0000 (22:43 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  selinux: fix labeling of /proc/net inodes


Trivial merge