tree c83ac73e3d569156d4b7f3dab3e7e27e0054cd0d
parent 6092c79fd00ce48ee8698955ea6419cc5cd65641
parent c3bebc71c4bcdafa24b506adf0c1de3c1f77e2e0
author David S. Miller <davem@davemloft.net> 1394069522 -0500
committer David S. Miller <davem@davemloft.net> 1394069522 -0500

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>