Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 Jan 2008 03:45:49 +0000 (19:45 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 Jan 2008 03:45:49 +0000 (19:45 -0800)
commit8b85eaadd5b8d3786996bd74c73aff54a92ec456
tree7ef6ed3e5955a45d54b1d223e3ebf7749aa3b918
parentf290fc3669d659a915e29b6bdb82d454b437cf93
parent45c950e0f839fded922ebc0bfd59b1081cc71b70
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 netlabel code