]> git.hungrycats.org Git - linux/commitdiff
Merge nuts.davemloft.net:/disk1/BK/network-2.6
authorDavid S. Miller <davem@nuts.davemloft.net>
Fri, 30 Jul 2004 06:00:42 +0000 (23:00 -0700)
committerDavid S. Miller <davem@nuts.davemloft.net>
Fri, 30 Jul 2004 06:00:42 +0000 (23:00 -0700)
into nuts.davemloft.net:/disk1/BK/net-2.6

1  2 
include/linux/list.h

Simple merge