Merge branch 'docs-security' into docs-move

author Randy Dunlap <randy.dunlap@oracle.com>

Fri, 20 May 2011 16:10:04 +0000 (09:10 -0700)

committer Randy Dunlap <randy.dunlap@oracle.com>

Fri, 20 May 2011 16:10:04 +0000 (09:10 -0700)
author Randy Dunlap <randy.dunlap@oracle.com>
Fri, 20 May 2011 16:10:04 +0000 (09:10 -0700)
committer Randy Dunlap <randy.dunlap@oracle.com>
Fri, 20 May 2011 16:10:04 +0000 (09:10 -0700)
diff --cc Documentation/00-INDEX
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Randy Dunlap <randy.dunlap@oracle.com>
	Fri, 20 May 2011 16:10:04 +0000 (09:10 -0700)
committer	Randy Dunlap <randy.dunlap@oracle.com>
	Fri, 20 May 2011 16:10:04 +0000 (09:10 -0700)
		1	2
Documentation/00-INDEX	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history