Merge branch 'master' into next
James Morris [Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)]
1  2 
Documentation/kernel-parameters.txt
security/tomoyo/common.c

Simple merge
Simple merge