forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/drivers/net/wireless
History
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
ath Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
b43 b43: probe bcma core (device) rev 0x15 2015-09-26 20:37:36 +03:00
b43legacy mac80211: convert HW flags to unsigned long bitmap 2015-06-10 16:05:36 +02:00
brcm80211 Major changes: 2015-10-12 19:39:18 -07:00
cw1200 mac80211: allow to transmit A-MSDU within A-MPDU 2015-09-22 15:21:23 +02:00
hostap net: hostap: convert to using IFF_NO_QUEUE 2015-08-18 11:55:07 -07:00
ipw2x00 drivers/net: get rid of unnecessary initializations in .get_drvinfo() 2015-10-16 00:24:10 -07:00
iwlegacy mac80211: allow to transmit A-MSDU within A-MPDU 2015-09-22 15:21:23 +02:00
iwlwifi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
libertas
libertas_tf Minor merge needed, due to function move. 2015-07-01 10:49:25 -07:00
mediatek mac80211: allow to transmit A-MSDU within A-MPDU 2015-09-22 15:21:23 +02:00
mwifiex Major changes: 2015-10-12 19:39:18 -07:00
orinoco orinoco: fix checking for default value 2015-09-22 16:14:32 -07:00
p54 mac80211: convert HW flags to unsigned long bitmap 2015-06-10 16:05:36 +02:00
prism54
rsi mac80211: allow to transmit A-MSDU within A-MPDU 2015-09-22 15:21:23 +02:00
rt2x00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
rtl818x mac80211: convert HW flags to unsigned long bitmap 2015-06-10 16:05:36 +02:00
rtlwifi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
ti Major changes: 2015-10-12 19:39:18 -07:00
zd1211rw mac80211: convert HW flags to unsigned long bitmap 2015-06-10 16:05:36 +02:00
adm8211.c mac80211: convert HW flags to unsigned long bitmap 2015-06-10 16:05:36 +02:00
adm8211.h
airo.c airo: Implement netif_carrier_on/off 2015-09-29 11:07:02 +03:00
airo.h
airo_cs.c
at76c50x-usb.c mac80211: convert HW flags to unsigned long bitmap 2015-06-10 16:05:36 +02:00
at76c50x-usb.h
atmel.c
atmel.h
atmel_cs.c
atmel_pci.c
Kconfig
mac80211_hwsim.c For the current cycle, we have the following right now: 2015-10-07 04:29:18 -07:00
mac80211_hwsim.h
Makefile
mwl8k.c mac80211: allow to transmit A-MSDU within A-MPDU 2015-09-22 15:21:23 +02:00
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c rndis_wlan: fix checking for default value 2015-09-22 16:14:32 -07:00
wl3501.h
wl3501_cs.c
zd1201.c
zd1201.h