q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/net/bridge
History
David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2013-01-15 15:05:59 -05:00
..
netfilter Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-15 11:43:53 -04:00
Kconfig
…
Makefile bridge: export multicast database via netlink 2012-12-07 14:32:52 -05:00
br.c
…
br_device.c ethtool: fix drvinfo strings set in drivers 2013-01-06 21:06:31 -08:00
br_fdb.c netlink: add attributes to fdb interface 2012-10-01 18:39:44 -04:00
br_forward.c netpoll: check netpoll tx status on the right device 2012-08-14 14:33:32 -07:00
br_if.c bridge: remove usage of netdev_set_master() 2013-01-04 13:31:50 -08:00
br_input.c eth: Make is_link_local() consistent with other address tests 2012-11-02 21:34:05 -04:00
br_ioctl.c net: Allow userns root to control the network bridge code. 2012-11-18 20:33:00 -05:00
br_mdb.c bridge: Correctly encode addresses when dumping mdb entries 2012-12-19 12:50:06 -08:00
br_multicast.c bridge: Correctly unregister MDB rtnetlink handlers 2013-01-03 01:56:11 -08:00
br_netfilter.c bridge: Pull ip header into skb->data before looking into ip header. 2012-10-10 22:50:45 -04:00
br_netlink.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-01-15 15:05:59 -05:00
br_notify.c bridge: respect RFC2863 operational state 2012-12-30 02:31:43 -08:00
br_private.h bridge: add empty br_mdb_init() and br_mdb_uninit() definitions. 2013-01-03 03:35:22 -08:00
br_private_stp.h net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
br_stp.c bridge: add root port blocking 2012-11-14 20:20:44 -05:00
br_stp_bpdu.c bridge: implement BPDU blocking 2012-11-14 20:20:44 -05:00
br_stp_if.c bridge: respect RFC2863 operational state 2012-12-30 02:31:43 -08:00
br_stp_timer.c time: jiffies_delta_to_clock_t() helper to the rescue 2012-08-09 16:17:03 -07:00
br_sysfs_br.c net: Allow userns root to control the network bridge code. 2012-11-18 20:33:00 -05:00
br_sysfs_if.c bridge: implement multicast fast leave 2012-12-05 16:24:45 -05:00