David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
b43	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
b43legacy	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
brcm80211	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
cw1200	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
hostap	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ipw2x00	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
iwlegacy	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
libertas	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
libertas_tf	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
mwifiex	Major changes:	2015-04-01 14:27:28 -04:00
orinoco	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
p54	mac80211: make LED trigger names const	2015-05-05 14:21:55 +02:00
prism54	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
rsi	rsi: fix memory leak in rsi_load_ta_instructions()	2014-12-24 17:26:08 +02:00
rt2x00	mac80211: extend get_tkip_seq to all keys	2015-05-06 13:29:59 +02:00
rtl818x	rtl818x_pci: fix response rate may be incorrect.	2014-10-07 14:48:37 -04:00
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
ti	Lots of updates for net-next for this cycle. As usual, we have	2015-05-09 17:27:25 -04:00
zd1211rw	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
Kconfig	net: fix USB network driver config option.	2014-08-06 16:00:20 -07:00
Makefile	…
adm8211.c	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
adm8211.h	…
airo.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-04-15 09:00:47 -07:00
airo.h	…
airo_cs.c	airo_cs: Remove typedef local_info_t	2014-08-11 12:19:53 -07:00
at76c50x-usb.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
at76c50x-usb.h	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
atmel.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
atmel.h	…
atmel_cs.c	atmel_cs: Remove typedef local_info_t	2014-08-25 16:17:41 -04:00
atmel_pci.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
mac80211_hwsim.c	mac80211_hwsim: Fix the supported VHT mcs rates	2015-05-06 14:51:27 +02:00
mac80211_hwsim.h	mac80211-hwsim: Add HWSIM_CMD_GET_RADIO command	2014-11-19 18:59:32 +01:00
mwl8k.c	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
ray_cs.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ray_cs.h	ray_cs: Add include guards	2014-08-28 14:41:56 -04:00
rayctl.h	ray_cs: Add include guards	2014-08-28 14:41:56 -04:00
rndis_wlan.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
wl3501.h	…
wl3501_cs.c	…
zd1201.c	…
zd1201.h	…