tree 18a9bb34e46027efbb8c0a6c149335c66f9b9012
parent 9b73e76f3cf63379dcf45fcd4f112f5812418d0a
parent b1aa5301b9f88a4891061650c591fb8fe1c1d1da
author Linus Torvalds <torvalds@linux-foundation.org> 1201416236 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1201416236 -0800

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