Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
David Woodhouse [Thu, 19 May 2005 10:54:00 +0000 (11:54 +0100)]
1  2 
security/selinux/ss/services.c

Simple merge