David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-12 13:19:14 -04:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
b43	b43: N-PHY: complete radio 0x2056 setup	2014-04-30 12:13:14 -04:00
b43legacy	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
cw1200	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-04-30 12:04:27 -04:00
hostap	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-03-04 13:05:12 -05:00
ipw2x00	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
iwlegacy	iwlegacy: Convert /n to \n	2014-04-30 12:08:17 -04:00
iwlwifi	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-04-30 12:04:27 -04:00
libertas	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
libertas_tf
mwifiex	Revert "mwifiex: add firmware dump feature for PCIe"	2014-04-24 21:33:55 -04:00
orinoco	orinoco: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:12:36 -05:00
p54	mac80211: add vif to flush call	2014-04-09 10:55:29 +02:00
prism54	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
rsi	rsi: Changing opcode for sta mode according to changes in firmware	2014-04-30 12:13:16 -04:00
rt2x00	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
rtl818x	rtl8180: be paranoid in stopping unused queues.	2014-04-22 15:06:27 -04:00
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
ti	wlcore: fix usage of platform_device_add_data()	2014-04-30 12:08:17 -04:00
zd1211rw
adm8211.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-01-17 14:43:17 -05:00
adm8211.h
airo_cs.c
airo.c	airo: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:11:13 -05:00
airo.h
at76c50x-usb.c	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-01-13 14:40:59 -05:00
at76c50x-usb.h
atmel_cs.c
atmel_pci.c
atmel.c	atmel: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:11:13 -05:00
atmel.h
Kconfig	rsi: Add RS9113 wireless driver	2014-03-17 13:51:52 -04:00
mac80211_hwsim.c	mac80211_hwsim: Advertise support for AP mode channel width changes	2014-04-28 18:11:59 +02:00
mac80211_hwsim.h	mac80211_hwsim: allow creation of single-channel radios with chanctx	2014-02-11 13:10:02 +01:00
Makefile	rsi: Add RS9113 wireless driver	2014-03-17 13:51:52 -04:00
mwl8k.c	mwl8k: mwl8k_update_survey can be static	2014-03-06 14:29:58 -05:00
ray_cs.c	ray_cs: replace del_timer by del_timer_sync	2014-04-22 15:06:28 -04:00
ray_cs.h
rayctl.h
rndis_wlan.c	rndis_wlan: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:12:36 -05:00
wl3501_cs.c	wl3501_cs: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:12:36 -05:00
wl3501.h
zd1201.c	zd1201: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:12:36 -05:00
zd1201.h