Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

author David S. Miller <davem@davemloft.net>

Wed, 24 Sep 2014 20:48:32 +0000 (16:48 -0400)

committer David S. Miller <davem@davemloft.net>

Wed, 24 Sep 2014 20:48:32 +0000 (16:48 -0400)
author David S. Miller <davem@davemloft.net>
Wed, 24 Sep 2014 20:48:32 +0000 (16:48 -0400)
committer David S. Miller <davem@davemloft.net>
Wed, 24 Sep 2014 20:48:32 +0000 (16:48 -0400)
diff --cc arch/sparc/net/bpf_jit_comp.c
Simple merge
diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge
diff --cc drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Wed, 24 Sep 2014 20:48:32 +0000 (16:48 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 24 Sep 2014 20:48:32 +0000 (16:48 -0400)
		1	2
arch/sparc/net/bpf_jit_comp.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	patch \|	diff1 \|	diff2 \|	blob \| history