leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
227158db16
linux/drivers/net/wireless
History
David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-21 22:28:24 -05:00
..
ath Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-21 22:28:24 -05:00
b43 It has been a while since my last pull request, so we accumulated 2014-11-20 16:09:30 -05:00
b43legacy
brcm80211 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-21 22:28:24 -05:00
cw1200 mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR 2014-11-19 18:46:09 +01:00
hostap wireless: hostap: proc: print properly escaped SSID 2014-10-14 02:18:27 +02:00
ipw2x00 ipw2x00: clean up a condition 2014-10-27 14:16:14 -04:00
iwlegacy mac80211: allow channel switch with multiple channel contexts 2014-10-09 11:30:09 +02:00
iwlwifi Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-11-19 15:38:48 -05:00
libertas wireless: libertas: print esaped string via %*pE 2014-10-14 02:18:26 +02:00
libertas_tf treewide: Fix typo in printk 2014-08-26 09:35:54 +02:00
mwifiex mwifiex: Add USB8766 support 2014-11-20 16:14:39 -05:00
orinoco drivers/net: Convert remaining uses of pr_warning to pr_warn 2014-09-09 20:37:08 -07:00
p54 mac80211: extend set_coverage_class signature 2014-09-05 13:54:07 +02:00
prism54 PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
rsi
rt2x00 It has been a while since my last pull request, so we accumulated 2014-11-20 16:09:30 -05:00
rtl818x rtl818x_pci: fix response rate may be incorrect. 2014-10-07 14:48:37 -04:00
rtlwifi It has been a while since my last pull request, so we accumulated 2014-11-20 16:09:30 -05:00
ti mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR 2014-11-19 18:46:09 +01:00
zd1211rw
adm8211.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
adm8211.h
airo_cs.c airo_cs: Remove typedef local_info_t 2014-08-11 12:19:53 -07:00
airo.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
airo.h
at76c50x-usb.c at76c50x-usb: fix use after free on failure path in at76_probe() 2014-08-25 15:39:23 -04:00
at76c50x-usb.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
atmel.c atmel: Remove typedef atmel_priv_ioctl 2014-08-11 12:19:53 -07:00
atmel.h
Kconfig net: fix USB network driver config option. 2014-08-06 16:00:20 -07:00
mac80211_hwsim.c It has been a while since my last pull request, so we accumulated 2014-11-20 16:09:30 -05:00
mac80211_hwsim.h mac80211-hwsim: Add HWSIM_CMD_GET_RADIO command 2014-11-19 18:59:32 +01:00
Makefile
mwl8k.c mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR 2014-11-19 18:46:09 +01:00
ray_cs.c
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 cfg80211: allow passing frame type to cfg80211_inform_bss() 2014-08-26 11:16:02 +02:00
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h