Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Sep 2014 20:48:32 +0000 (16:48 -0400)
committerDavid 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
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

Simple merge
Simple merge