Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 30 Mar 2010 21:39:27 +0000 (08:39 +1100)
commitd25d6fa1a95f465ff1ec4458ca15e30b2c8dffec
tree7362b182dedd825fc762ef7706830837e42943af
parent225a9be24d799aa16d543c31fb09f0c9ed1d9caa
parent2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6
Merge branch 'master' into next
Documentation/kernel-parameters.txt
security/tomoyo/common.c