Merge branch 'master' into next
James Morris [Wed, 9 Dec 2009 08:01:03 +0000 (19:01 +1100)]
1  2 
security/tomoyo/file.c
security/tomoyo/tomoyo.c
security/tomoyo/tomoyo.h

Simple merge
Simple merge
Simple merge