Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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:
  tomoyo: remove "undelete domain" command.
This commit is contained in:
Linus Torvalds 2009-04-07 08:02:02 -07:00
commit 548cbdc858
3 changed files with 5 additions and 100 deletions