Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commit2165f631f0e1d4e9a1ee425ef05cb727352285e0
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Oct 2008 01:22:36 +0000 (3 18:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Oct 2008 01:22:36 +0000 (3 18:22 -0700)
tree43be885c57a085eab44ac148ed0d08bb88076075
parent76acae04c892287949e1191e99600f3e952e43f7
parent3040a6d5a2655c7967bd42b5fb4903d48daa747f
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: Fix an uninitialized variable BUG/panic in selinux_secattr_to_sid()