tree 3cbf8d08d85912c871d4f973b95069e6035ddd6f
parent 1c98aa7424ff163637d8321674ec58dee28152d4
parent 39826a1e17c1957bd7b5cd7815b83940e5e3a230
author Linus Torvalds <torvalds@linux-foundation.org> 1239671769 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239671769 -0700

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