Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commitb21597d0268983f8f9e8b563494f75490403e948
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2009 01:16:09 +0000 (13 18:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2009 01:16:09 +0000 (13 18:16 -0700)
tree3cbf8d08d85912c871d4f973b95069e6035ddd6f
parent1c98aa7424ff163637d8321674ec58dee28152d4
parent39826a1e17c1957bd7b5cd7815b83940e5e3a230
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:
  tomoyo: version bump to 2.2.0.
  tomoyo: add Documentation/tomoyo.txt