Merge branch 'master' into next

author James Morris <[email protected]>

Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)

committer James Morris <[email protected]>

Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
author James Morris <[email protected]>
Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
committer James Morris <[email protected]>
Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc security/tomoyo/common.c
Simple merge
author	James Morris <[email protected]>
	Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
committer	James Morris <[email protected]>
	Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
security/tomoyo/common.c	patch \|	diff1 \|	diff2 \|	blob \| history