Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Jul 2007 19:32:12 +0000 (12:32 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Jul 2007 19:32:12 +0000 (12:32 -0700)
commit6e8a43c8432649686921b57255db8172edcebf6f
tree57867bdcb71b5bd0339f822ddb8032974a37a822
parentb2e961eb2e7a54ffaae82f8e0198b26b54ade98e
parent0ec8abd7086ee4f760cb1b477fe376805b17558c
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 memory leak in security_netlbl_cache_add()