]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.skbuff.net:20611/linux-2.6-sysctl/
authorDavid S. Miller <davem@nuts.davemloft.net>
Wed, 23 Feb 2005 12:02:03 +0000 (04:02 -0800)
committerDavid S. Miller <davem@nuts.davemloft.net>
Wed, 23 Feb 2005 12:02:03 +0000 (04:02 -0800)
into nuts.davemloft.net:/disk1/BK/net-2.6

1  2 
include/linux/sysctl.h

Simple merge