Linus Torvalds 5d7d5d9332 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits) slip: fix wrong SLIP6 ifdef-endif placing natsemi: fix another dma-debug report sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket net: Fix default in docs for tcp_orphan_retries. hso: fix a use after free condition net/natsemi: Fix module parameter permissions XFRM: Fix memory leak in xfrm_state_update sctp: Enforce retransmission limit during shutdown mac80211: fix TKIP replay vulnerability mac80211: fix ie memory allocation for scheduled scans ssb: fix init regression of hostmode PCI core rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M ath9k: Fix tx throughput drops for AR9003 chips with AES encryption carl9170: add NEC WL300NU-AG usbid cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex ath5k: fix incorrect use of drvdata in PCI suspend/resume code ath5k: fix incorrect use of drvdata in sysfs code Bluetooth: Fix memory leak under page timeouts Bluetooth: Fix regression with incoming L2CAP connections Bluetooth: Fix hidp disconnect deadlocks and lost wakeup ...		2011-07-13 13:51:32 -07:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-13 13:51:32 -07:00
b43	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-06-04 23:16:00 +09:00
b43legacy	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-05-16 19:32:19 -04:00
hostap	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
ipw2x00	treewide: fix a few typos in comments	2011-05-10 10:16:21 +02:00
iwlegacy	iwlegacy: fix channel switch locking	2011-06-08 14:19:05 -04:00
iwlwifi	iwlagn: use PCI_DMA_* for pci_* operations	2011-06-28 11:16:39 -04:00
iwmc3200wifi	Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-05-24 16:47:54 -04:00
libertas	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem	2011-06-06 13:58:21 -04:00
libertas_tf
mwifiex	mwifiex: Fixing NULL pointer dereference	2011-06-15 08:13:03 -04:00
orinoco	pcmcia: Convert pcmcia_device_id declarations to const	2011-05-06 07:46:22 +02:00
p54	Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-05-24 16:47:54 -04:00
prism54
rt2x00	rt2x00: fix rmmod crash	2011-06-06 15:24:18 -04:00
rtl818x
rtlwifi	rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M	2011-07-05 14:42:38 -04:00
wl12xx	wl12xx: fix oops in sched_scan when forcing a passive scan	2011-05-31 14:47:26 -04:00
wl1251
zd1211rw	zd1211rw: fix to work on OHCI	2011-05-31 14:47:26 -04:00
adm8211.c
adm8211.h
airo.c	Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6	2011-05-25 13:28:55 -04:00
airo.h
airo_cs.c	pcmcia: Convert pcmcia_device_id declarations to const	2011-05-06 07:46:22 +02:00
at76c50x-usb.c
at76c50x-usb.h
atmel.c
atmel.h
atmel_cs.c	pcmcia: Convert pcmcia_device_id declarations to const	2011-05-06 07:46:22 +02:00
atmel_pci.c
Kconfig
mac80211_hwsim.c	net: call dev_alloc_name from register_netdevice	2011-05-05 10:57:45 -07:00
Makefile
mwl8k.c	mwl8k: Tell firmware to generate CCMP header	2011-06-15 08:13:03 -04:00
ray_cs.c	pcmcia: Convert pcmcia_device_id declarations to const	2011-05-06 07:46:22 +02:00
ray_cs.h
rayctl.h
rndis_wlan.c	cfg80211: Use consistent BSS matching between scan and sme	2011-05-19 10:37:18 -04:00
wl3501.h
wl3501_cs.c	pcmcia: Convert pcmcia_device_id declarations to const	2011-05-06 07:46:22 +02:00
zd1201.c
zd1201.h