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
br_input.c
br_ioctl.c
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
br_notify.c
br_private_stp.h
br_private.h	net:bridge: use IS_ENABLED	2011-12-16 15:49:52 -05:00
br_stp_bpdu.c
br_stp_if.c
br_stp_timer.c
br_stp.c
br_sysfs_br.c
br_sysfs_if.c
br.c	net:bridge: use IS_ENABLED	2011-12-16 15:49:52 -05:00
Kconfig
Makefile