tree 7ef6ed3e5955a45d54b1d223e3ebf7749aa3b918
parent f290fc3669d659a915e29b6bdb82d454b437cf93
parent 45c950e0f839fded922ebc0bfd59b1081cc71b70
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1200973549 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1200973549 -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 memory leak in netlabel code