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
..
brcmfmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
brcmsmac	brcmsmac: delete useless variable	2014-01-13 14:50:06 -05:00
brcmutil	brcmutil: simplify brcmu_pkt_free_skb()	2013-04-22 15:20:21 -04:00
include	brcmfmac: add support for bcm43362 device	2014-01-09 10:56:38 -05:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-12-06 09:50:45 -05:00
Makefile	brcm80211: Use normal DEBUG define	2012-01-24 14:21:13 -05:00