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)
commit69e4d4c3e1cb23fce81deeae08b502d27bad6993
tree18a9bb34e46027efbb8c0a6c149335c66f9b9012
parent9b73e76f3cf63379dcf45fcd4f112f5812418d0a
parentb1aa5301b9f88a4891061650c591fb8fe1c1d1da
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