David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-12-23 17:13:56 -05:00

..

netfilter

net:bridge: use IS_ENABLED

2011-12-16 15:49:52 -05:00

br_device.c

bridge: add local MAC address to forwarding table (v2)

2011-12-08 19:40:28 -05:00

br_fdb.c

net:bridge: use IS_ENABLED

2011-12-16 15:49:52 -05:00

br_forward.c

bridge: add local MAC address to forwarding table (v2)

2011-12-08 19:40:28 -05:00

br_if.c

net: introduce and use netdev_features_t for device features sets

2011-11-16 17:43:10 -05:00

br_input.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

br_ioctl.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-04-11 13:44:25 -07:00

br_multicast.c

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

br_netfilter.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-23 17:13:56 -05:00

br_netlink.c

bridge: master device stuck in no-carrier state forever when in user-stp mode

2011-12-01 14:05:17 -05:00

br_notify.c

Bridge: Always send NETDEV_CHANGEADDR up on br MAC change.

2011-08-09 21:44:44 -07:00

br_private_stp.h

bridge: minor cleanups

2011-07-22 17:01:13 -07:00

br_private.h

net:bridge: use IS_ENABLED

2011-12-16 15:49:52 -05:00

br_stp_bpdu.c

bridge: minor cleanups

2011-07-22 17:01:13 -07:00

br_stp_if.c

net: fix implicit kmod.h usage in bridge/br_stp_if.c

2011-10-31 19:30:30 -04:00

br_stp_timer.c

bridge: add notification over netlink when STP changes state

2011-07-22 17:01:12 -07:00

br_stp.c

bridge: master device stuck in no-carrier state forever when in user-stp mode

2011-12-01 14:05:17 -05:00

br_sysfs_br.c

bridge: allow forwarding some link local frames

2011-10-06 15:27:56 -04:00

br_sysfs_if.c

bridge: range check STP parameters

2011-04-04 17:22:29 -07:00

br.c

net:bridge: use IS_ENABLED

2011-12-16 15:49:52 -05:00

Kconfig

net: bridge builtin vs. ipv6 modular

2011-03-10 13:45:57 -08:00

Makefile

bridge: Add core IGMP snooping support

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