Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2009 17:21:10 +0000 (10:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2009 17:21:10 +0000 (10:21 -0700)
commit153d8a122e04d285aaee0ba00af7564182b7b6de
tree6de586e234b4021464fd71930a7e7f60717c4430
parent2a50b2560ee956808da0b644cb529608dee65274
parent211a40c0870457b29100cffea0180fa5083caf96
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:
  smack: fixes for unlabeled host support