David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -07:00
..
netfilter	netfilter: ebt_ulog: Move away from NLMSG_PUT().	2012-06-26 21:23:42 -07:00
br_device.c	bridge: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -04:00
br_fdb.c	bridge: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -04:00
br_forward.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
br_if.c	bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)	2012-06-26 21:12:32 -07:00
br_input.c	bridge: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -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	ipv6: correct the ipv6 option name - Pad0 to Pad1	2012-05-17 15:49:51 -04:00
br_netfilter.c	netfilter: bridge: switch hook PFs to nfproto	2012-06-07 14:58:42 +02:00
br_netlink.c	bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)	2012-06-26 21:12:32 -07: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	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
br_private.h	bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)	2012-06-26 21:12:32 -07:00
br_stp_bpdu.c	bridge: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -04:00
br_stp_if.c	bridge: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:17 -04:00
br_stp_timer.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
br_stp.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
br_sysfs_br.c	bridge: Add multicast_querier toggle and disable queries by default	2012-04-15 12:51:35 -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