David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
hsr_device.c	hsr: Use ether_addr_copy	2014-02-18 18:14:09 -05:00
hsr_device.h	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00
hsr_framereg.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
hsr_framereg.h	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00
hsr_main.c	hsr: Use ether_addr_copy	2014-02-18 18:14:09 -05:00
hsr_main.h	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00
hsr_netlink.c	net/hsr: Support iproute print_opt ('ip -details ...')	2013-11-30 12:48:14 -05:00
hsr_netlink.h	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00
Kconfig	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00
Makefile	net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)	2013-11-03 23:20:14 -05:00