diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 05:16:09 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 05:16:09 +0400 |
commit | b21597d0268983f8f9e8b563494f75490403e948 (patch) | |
tree | 3cbf8d08d85912c871d4f973b95069e6035ddd6f /security/tomoyo/domain.c | |
parent | 1c98aa7424ff163637d8321674ec58dee28152d4 (diff) | |
parent | 39826a1e17c1957bd7b5cd7815b83940e5e3a230 (diff) | |
download | linux-b21597d0268983f8f9e8b563494f75490403e948.tar.xz |
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: version bump to 2.2.0.
tomoyo: add Documentation/tomoyo.txt
Diffstat (limited to 'security/tomoyo/domain.c')
-rw-r--r-- | security/tomoyo/domain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c index 2f2b449ffd2d..2d6748741a26 100644 --- a/security/tomoyo/domain.c +++ b/security/tomoyo/domain.c @@ -5,7 +5,7 @@ * * Copyright (C) 2005-2009 NTT DATA CORPORATION * - * Version: 2.2.0-pre 2009/02/01 + * Version: 2.2.0 2009/04/01 * */ |