David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-21 22:28:24 -05:00
..
netfilter	netfilter: nft_reject_bridge: Fix powerpc build error	2014-11-03 12:12:34 -05:00
br.c	netfilter: bridge: move br_netfilter out of the core	2014-09-26 18:42:31 +02:00
br_device.c	bridge: Add filtering support for default_pvid	2014-10-05 21:21:37 -04:00
br_fdb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-05 18:46:26 -07:00
br_forward.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-01 14:53:27 -04:00
br_if.c	bridge: Add filtering support for default_pvid	2014-10-05 21:21:37 -04:00
br_input.c	bridge: Add support for IEEE 802.11 Proxy ARP	2014-10-27 19:02:04 -04:00
br_ioctl.c	bridge: add space before '(/{', after ',', etc.	2013-12-19 19:27:26 -05:00
br_mdb.c	bridge: rename struct bridge_mcast_query/querier	2014-06-10 23:50:46 -07:00
br_multicast.c	bridge: fix netfilter/NF_BR_LOCAL_OUT for own, locally generated queries	2014-11-17 12:38:02 +01:00
br_netfilter.c	bridge: Do not compile options in br_parse_ip_options	2014-10-24 14:24:03 +02:00
br_netlink.c	bridge: Add support for IEEE 802.11 Proxy ARP	2014-10-27 19:02:04 -04:00
br_nf_core.c	netfilter: bridge: move br_netfilter out of the core	2014-09-26 18:42:31 +02:00
br_private.h	bridge: Add support for IEEE 802.11 Proxy ARP	2014-10-27 19:02:04 -04:00
br_private_stp.h	net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
br_stp.c	net: bridge: add a br_set_state helper function	2014-10-01 22:03:50 -04:00
br_stp_bpdu.c	br: fix use of ->rx_handler_data in code executed on non-rx_handler path	2013-12-06 15:41:40 -05:00
br_stp_if.c	net: bridge: add a br_set_state helper function	2014-10-01 22:03:50 -04:00
br_stp_timer.c	net: bridge: add a br_set_state helper function	2014-10-01 22:03:50 -04:00
br_sysfs_br.c	bridge: Add a default_pvid sysfs attribute	2014-10-05 21:21:36 -04:00
br_sysfs_if.c	bridge: Add support for IEEE 802.11 Proxy ARP	2014-10-27 19:02:04 -04:00
br_vlan.c	vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto	2014-11-21 14:20:17 -05:00
Kconfig	bridge: Add vlan filtering infrastructure	2013-02-13 19:41:46 -05:00
Makefile	netfilter: bridge: build br_nf_core only if required	2014-09-30 14:07:51 -04:00