]> git.neil.brown.name Git - history.git/commit
Merge nuts.ninka.net:/disk1/davem/BK/netleak-2.5
authorDavid S. Miller <davem@nuts.ninka.net>
Wed, 31 Dec 2003 02:19:13 +0000 (18:19 -0800)
committerDavid S. Miller <davem@nuts.ninka.net>
Wed, 31 Dec 2003 02:19:13 +0000 (18:19 -0800)
commitf685645bf49cef710761c0d8a58fd0cda6bc1919
tree7b3108df41fd38f4b4530c52950e4843803ce30d
parenta077e99d64d9d1d7aa046424e4a4388de9bcfc5b
parent6bb00924ba40500eb0aec83c89a09a19570ce395
Merge nuts.ninka.net:/disk1/davem/BK/netleak-2.5
into nuts.ninka.net:/disk1/davem/BK/net-2.6
include/linux/netfilter_bridge.h
net/bridge/br_netfilter.c