Linus Torvalds 1f1c2881f6 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ...

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
  forcedeth bug fix: realtek phy
  forcedeth bug fix: vitesse phy
  forcedeth bug fix: cicada phy
  atl1: reorder atl1_main functions
  atl1: fix excessively indented code
  atl1: cleanup atl1_main
  atl1: header file cleanup
  atl1: remove irq_sem
  cdc-subset to support new vendor/product ID
  8139cp: implement the missing dev->tx_timeout
  myri10ge: Remove nonsensical limit in the tx done routine
  gianfar: kill unused header
  EP93XX_ETH must select MII
  macb: Add multicast capability
  macb: Use generic PHY layer
  s390: add barriers to qeth driver
  s390: scatter-gather for inbound traffic in qeth driver
  eHEA: Introducing support vor DLPAR memory add
  Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c
  [PATCH] softmac: Fix ESSID problem
  ...

2007-07-16 17:48:54 -07:00

..

bcm43xx

PCI: Change all drivers to use pci_device->revision

2007-07-11 16:02:10 -07:00

hostap

PCI: remove useless pci driver method

2007-07-11 16:02:08 -07:00

libertas

[PATCH] libertas: fix disabling WPA

2007-07-10 14:23:03 -04:00

prism54

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

2007-07-16 17:48:54 -07:00

zd1211rw

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

2007-07-16 17:48:54 -07:00

airo_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

airo.c

[PATCH] airo: start with radio off

2007-07-10 14:11:29 -04:00

airo.h

[PATCH] airo.c/airo_cs.c: correct prototypes

2005-11-05 21:00:03 -05:00

airport.c

Fix occurrences of "the the "

2007-05-09 08:57:56 +02:00

arlan-main.c

[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans

2007-04-25 22:24:30 -07:00

arlan-proc.c

[PATCH] sysctl: remove insert_at_head from register_sysctl

2007-02-14 08:09:59 -08:00

arlan.h

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

atmel_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

atmel_pci.c

[PATCH] atmel: whitespace cleanup

2006-12-02 00:11:57 -05:00

atmel.c

[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}

2007-04-25 22:28:23 -07:00

atmel.h

[PATCH] Atmel wireless update

2005-11-11 08:12:17 -05:00

hermes_rid.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hermes.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

hermes.h

[PATCH] orinoco: don't use any padding for Tx frames

2006-04-24 16:15:51 -04:00

i82586.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

i82593.h

[PATCH] i82593.h: make header comment GPL-compatible

2005-11-18 13:29:06 -05:00

ipw2100.c

[PATCH] ipw2100: RF kill switch timer power save

2007-07-10 13:59:48 -04:00

ipw2100.h

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

ipw2200.c

[PATCH] ipw2200: rf kill switch polling power saving

2007-07-10 13:59:48 -04:00

ipw2200.h

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

Kconfig

[PATCH] Add rtl8187 wireless driver

2007-07-08 22:16:36 -04:00

Makefile

[PATCH] Add rtl8187 wireless driver

2007-07-08 22:16:36 -04:00

netwave_cs.c

[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans

2007-04-25 22:24:30 -07:00

orinoco_cs.c

Network: convert network devices to use struct device instead of class_device

2007-02-07 10:37:11 -08:00

orinoco_nortel.c

drivers/net: Remove deprecated use of pci_module_init()

2006-08-19 17:48:59 -04:00

orinoco_pci.c

drivers/net: Remove deprecated use of pci_module_init()

2006-08-19 17:48:59 -04:00

orinoco_pci.h

[PATCH] wireless: clean-up some "check return code" warnings

2006-12-02 00:12:03 -05:00

orinoco_plx.c

drivers/net: Remove deprecated use of pci_module_init()

2006-08-19 17:48:59 -04:00

orinoco_tmd.c

drivers/net: Remove deprecated use of pci_module_init()

2006-08-19 17:48:59 -04:00

orinoco.c

[SK_BUFF]: Introduce skb_mac_header()

2007-04-25 22:24:41 -07:00

orinoco.h

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

ray_cs.c

[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}

2007-04-25 22:28:23 -07:00

ray_cs.h

[PATCH] pcmcia: remove dev_link_t and client_handle_t indirection

2006-03-31 17:21:06 +02:00

rayctl.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rtl818x.h

[PATCH] rtl8187: add header blocks and indicate origin of magic values

2007-07-08 22:16:37 -04:00

rtl8187_dev.c

[PATCH] rtl8187: add header blocks and indicate origin of magic values

2007-07-08 22:16:37 -04:00

rtl8187_rtl8225.c

[PATCH] rtl8187: fix endianness issue in rtl8225 register writing

2007-07-10 13:51:38 -04:00

rtl8187_rtl8225.h

[PATCH] rtl8187: add header blocks and indicate origin of magic values

2007-07-08 22:16:37 -04:00

rtl8187.h

[PATCH] rtl8187: add header blocks and indicate origin of magic values

2007-07-08 22:16:37 -04:00

spectrum_cs.c

Network: convert network devices to use struct device instead of class_device

2007-02-07 10:37:11 -08:00

strip.c

[NET]: Rework dev_base via list_head (v3)

2007-05-03 15:13:45 -07:00

wavelan_cs.c

Fix misspellings collected by members of KJ list.

2007-05-09 07:14:03 +02:00

wavelan_cs.h

Add HostAP wireless driver.

2005-05-12 22:54:16 -04:00

wavelan_cs.p.h

Fix misspellings collected by members of KJ list.

2007-05-09 07:14:03 +02:00

wavelan.c

[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}

2007-04-25 22:28:23 -07:00

wavelan.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

wavelan.p.h

[PATCH] wavelan: Use ARRAY_SIZE macro when appropriate

2007-02-14 15:45:04 -05:00

wl3501_cs.c

[NET]: Kill eth_copy_and_sum().

2007-07-10 22:08:12 -07:00

wl3501.h

[PATCH] pcmcia: embed dev_link_t into struct pcmcia_device

2006-03-31 17:15:57 +02:00

zd1201.c

[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}

2007-04-25 22:28:23 -07:00

zd1201.h

[PATCH] wireless: move zd1201 where it belongs

2006-06-05 16:13:30 -04:00