Linus Torvalds 6aa5fc4349 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: (73 commits) net: Fix typo in net/core/sock.c. ppp: Do not free not yet unregistered net device. netfilter: xt_iprange: module aliases for xt_iprange netfilter: ctnetlink: dump conntrack ID in event messages irda: Fix a misalign access issue. (v2) sctp: Fix use of uninitialized pointer cipso: Relax too much careful cipso hash function. tcp FRTO: work-around inorder receivers tcp FRTO: Fix fallback to conventional recovery New maintainer for Intel ethernet adapters DM9000: Use delayed work to update MII PHY state DM9000: Update and fix driver debugging messages DM9000: Add __devinit and __devexit attributes to probe and remove sky2: fix simple define thinko [netdrvr] sfc: sfc: Add self-test support [netdrvr] sfc: Increment rx_reset when reported as driver event [netdrvr] sfc: Remove unused macro EFX_XAUI_RETRAIN_MAX [netdrvr] sfc: Fix code formatting [netdrvr] sfc: Remove kernel-doc comments for removed members of struct efx_nic [netdrvr] sfc: Remove garbage from comment ...		2008-05-14 10:08:24 -07:00
..
ath5k	wireless: use get/put_unaligned_* helpers	2008-04-29 08:06:27 -07:00
b43	b43: Fix some TX/RX locking issues	2008-05-01 17:38:18 -04:00
b43legacy	wireless: use get/put_unaligned_* helpers	2008-04-29 08:06:27 -07:00
hostap	[NET]: Undo code bloat in hot paths due to print_mac().	2008-04-08 16:50:44 -07:00
iwlwifi	iwlwifi: Fix frequency in rx_status fill	2008-05-12 21:22:19 -04:00
libertas	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6	2008-05-01 02:06:32 -07:00
p54	drivers/net/wireless/p54/net2280.h: silence checkpatch.pl	2008-04-08 16:44:45 -04:00
prism54	prism54: fix regression with missing carrier in AP-mode	2008-05-12 21:18:04 -04:00
rt2x00	rt2x00: Clean up error handling of PCI queue DMA allocation.	2008-05-12 21:22:18 -04:00
zd1211rw	zd1211rw: fix potential use-after-free bug	2008-05-12 21:22:19 -04:00
adm8211.c	adm8211: remove commented-out code	2008-04-08 16:44:45 -04:00
adm8211.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
airo.c	wireless: use get/put_unaligned_* helpers	2008-04-29 08:06:27 -07:00
airo.h
airo_cs.c
airport.c
arlan-main.c
arlan-proc.c	arlan: fix warning when PROC_FS=n	2008-03-24 19:25:08 -04:00
arlan.h
atmel.c	drivers/net/wireless/atmel.c: Use time_* macros	2008-02-29 15:37:11 -05:00
atmel.h
atmel_cs.c
atmel_pci.c
hermes.c
hermes.h
hermes_rid.h
i82586.h
i82593.h
ipw2100.c	latency.c: use QoS infrastructure	2008-02-05 09:44:22 -08:00
ipw2100.h
ipw2200.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
ipw2200.h	ipw2200 annotations and fixes	2008-03-25 16:41:58 -04:00
Kconfig	p54: move to separate directory	2008-04-08 16:44:45 -04:00
Makefile	iwlwifi: Allow building iwl3945 without iwl4965.	2008-04-27 15:38:30 -07:00
netwave_cs.c	pcmcia: replace kio_addr_t with unsigned int everywhere	2008-02-05 09:44:08 -08:00
orinoco.c
orinoco.h
orinoco_cs.c
orinoco_nortel.c
orinoco_pci.c
orinoco_pci.h
orinoco_plx.c
orinoco_tmd.c
ray_cs.c	proc: switch /proc/driver/ray_cs/ray_cs to seq_file interface	2008-04-16 15:59:56 -04:00
ray_cs.h
rayctl.h
rndis_wlan.c	wireless: rndis_wlan: modparam_workaround_interval is never below 0.	2008-04-23 21:25:36 -04:00
rtl818x.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_dev.c	endianness annotations: drivers/net/wireless/rtl8180_dev.c	2008-04-01 17:13:16 -04:00
rtl8180_grf5101.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_grf5101.h
rtl8180_max2820.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_max2820.h
rtl8180_rtl8225.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_rtl8225.h
rtl8180_sa2400.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_sa2400.h
rtl8187.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8187_dev.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-04-17 23:56:30 -07:00
rtl8187_rtl8225.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8187_rtl8225.h
spectrum_cs.c
strip.c	strip: Fix termios assumption	2008-05-12 07:27:38 -07:00
wavelan.c	wavelan: avoid index past end of array if DEBUG_SHOW_UNUSED is defined	2008-05-12 21:18:05 -04:00
wavelan.h	wavelan: mark hardware interfacing structures as packed	2008-02-15 13:44:17 -05:00
wavelan.p.h
wavelan_cs.c	wavelan: avoid index past end of array if DEBUG_SHOW_UNUSED is defined	2008-05-12 21:18:05 -04:00
wavelan_cs.h	wavelan_cs arm fix	2008-03-24 19:25:07 -04:00
wavelan_cs.p.h	wavelan_cs: stop inlining largish static functions	2008-04-08 15:05:57 -04:00
wl3501.h
wl3501_cs.c
zd1201.c
zd1201.h