Linus Torvalds d2aa455037 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits) netxen: fix tx ring accounting netxen: fix detection of cut-thru firmware mode forcedeth: fix dma api mismatches atm: sk_wmem_alloc initial value is one net: correct off-by-one write allocations reports via-velocity : fix no link detection on boot Net / e100: Fix suspend of devices that cannot be power managed TI DaVinci EMAC : Fix rmmod error net: group address list and its count ipv4: Fix fib_trie rebalancing, part 2 pkt_sched: Update drops stats in act_police sky2: version 1.23 sky2: add GRO support sky2: skb recycling sky2: reduce default transmit ring sky2: receive counter update sky2: fix shutdown synchronization sky2: PCI irq issues sky2: more receive shutdown sky2: turn off pause during shutdown ... Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck		2009-06-18 14:07:15 -07:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
b43	b43: Add fw capabilities	2009-06-10 13:28:37 -04:00
b43legacy	b43/legacy: port to cfg80211 rfkill	2009-06-10 13:27:54 -04:00
hostap	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
ipw2x00	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
iwlwifi	iwlwifi/iwl3945: fix suspend resume association bug	2009-06-15 15:05:53 -04:00
iwmc3200wifi	cfg80211: fix Kconfig for users of cfg80211	2009-06-03 14:09:08 -04:00
libertas	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
libertas_tf	mac80211: unify config_interface and bss_info_changed	2009-05-06 15:14:36 -04:00
orinoco	orinoco: correct timeout logic in __orinoco_hw_set_tkip_key()	2009-04-16 10:39:17 -04:00
p54	wireless/p54: prepare for FIRMWARE_NAME_MAX removal	2009-06-03 14:05:15 -04:00
prism54	net: fix network drivers ndo_start_xmit() return values (part 3)	2009-06-13 01:18:37 -07:00
rt2x00	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
rtl818x	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
wl12xx	wireless: WL12XX should depend on GENERIC_HARDIRQS	2009-05-11 15:23:54 -04:00
zd1211rw	zd1211rw: Replace ZD_CS_MULTICAST with ZD_CS_NO_ACK	2009-05-20 14:46:24 -04:00
adm8211.c	mac80211: unify config_interface and bss_info_changed	2009-05-06 15:14:36 -04:00
adm8211.h
airo.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
airo.h
airo_cs.c
arlan-main.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
arlan-proc.c
arlan.h
at76c50x-usb.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
at76c50x-usb.h
atmel.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
atmel.h
atmel_cs.c	Wireless: remove driver_data direct access of struct device	2009-05-06 15:15:01 -04:00
atmel_pci.c
i82586.h
i82593.h
Kconfig	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
mac80211_hwsim.c	mac80211_hwsim: remove deprecated radio_enabled	2009-06-03 14:05:12 -04:00
Makefile	iwmc3200wifi: Add new Intel Wireless Multicomm 802.11 driver	2009-05-22 14:06:02 -04:00
mwl8k.c	mac80211: move HT operation mode BSS info	2009-05-11 15:23:57 -04:00
netwave_cs.c
ray_cs.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ray_cs.h
rayctl.h
rndis_wlan.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
strip.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
wavelan.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
wavelan.h
wavelan.p.h	wireless: convert wavelan to net_device_ops	2009-03-27 00:46:46 -07:00
wavelan_cs.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
wavelan_cs.h
wavelan_cs.p.h	wavelan: convert to internal net_device_stats	2009-03-21 22:43:58 -07:00
wl3501.h	wl3501: convert to internal net_device_stats	2009-03-21 22:51:19 -07:00
wl3501_cs.c	net: fix network drivers ndo_start_xmit() return values (part 3)	2009-06-13 01:18:37 -07:00
zd1201.c	net: fix network drivers ndo_start_xmit() return values (part 3)	2009-06-13 01:18:37 -07:00
zd1201.h	zd1201: convert to internal net_device_stats	2009-03-21 22:51:20 -07:00