]> git.hungrycats.org Git - linux/commitdiff
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
authorDavid S. Miller <davem@kernel.bkbits.net>
Sat, 8 Feb 2003 18:48:18 +0000 (10:48 -0800)
committerDavid S. Miller <davem@kernel.bkbits.net>
Sat, 8 Feb 2003 18:48:18 +0000 (10:48 -0800)
into kernel.bkbits.net:/home/davem/net-2.5

1  2 
security/capability.c

Simple merge