diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 18:16:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 18:16:09 -0700 |
| commit | b21597d0268983f8f9e8b563494f75490403e948 (patch) | |
| tree | 3cbf8d08d85912c871d4f973b95069e6035ddd6f /arch/x86/kernel | |
| parent | 1c98aa7424ff163637d8321674ec58dee28152d4 (diff) | |
| parent | 39826a1e17c1957bd7b5cd7815b83940e5e3a230 (diff) | |
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 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions