Patrick McHardy f9181f4ffc Merge branch 'master' of /repos/git/net-next-2.6 ...

Conflicts:
	include/net/netfilter/xt_rateest.h
	net/bridge/br_netfilter.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

2010-06-15 17:31:06 +02:00

..

netfilter

netfilter: xtables: change hotdrop pointer to direct modification

2010-05-11 18:35:27 +02:00

br_device.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

br_fdb.c

bridge: change console message interface

2010-05-15 23:10:02 -07:00

br_forward.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

br_if.c

net: replace hooks in __netif_receive_skb V5

2010-06-02 07:11:15 -07:00

br_input.c

net: replace hooks in __netif_receive_skb V5

2010-06-02 07:11:15 -07:00

br_ioctl.c

bridge: change console message interface

2010-05-15 23:10:02 -07:00

br_multicast.c

bridge: change console message interface

2010-05-15 23:10:02 -07:00

br_netfilter.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-06-15 17:31:06 +02:00

br_netlink.c

bridge: change console message interface

2010-05-15 23:10:02 -07:00

br_notify.c

bridge: update sysfs link names if port device names have changed

2010-05-15 23:10:15 -07:00

br_private_stp.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

br_private.h

net: replace hooks in __netif_receive_skb V5

2010-06-02 07:11:15 -07:00

br_stp_bpdu.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

br_stp_if.c

bridge: change console message interface

2010-05-15 23:10:02 -07:00

br_stp_timer.c

bridge: change console message interface

2010-05-15 23:10:02 -07:00

br_stp.c

bridge: change console message interface

2010-05-15 23:10:02 -07:00

br_sysfs_br.c

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

br_sysfs_if.c

bridge: update sysfs link names if port device names have changed

2010-05-15 23:10:15 -07:00

br.c

net: replace hooks in __netif_receive_skb V5

2010-06-02 07:11:15 -07:00

Kconfig

bridge br_multicast: IPv6 MLD support.

2010-04-23 13:35:56 +09:00

Makefile

bridge: Add core IGMP snooping support

2010-02-28 00:48:45 -08:00