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

..

isl_38xx.c

[PATCH] prism54: whitespace cleanup

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

isl_38xx.h

[PATCH] prism54: whitespace cleanup

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

isl_ioctl.c

[PATCH] use list_for_each_entry() for iteration in Prism 54 driver

2007-07-10 14:25:40 -04:00

isl_ioctl.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

isl_oid.h

[PATCH] prism54: use BUILD_BUG_ON

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

islpci_dev.c

Fix misspellings collected by members of KJ list.

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

islpci_dev.h

[PATCH] prism54: add ethtool -i interface

2007-02-05 16:58:42 -05:00

islpci_eth.c

[PATCH] prism54: fix monitor mode oops

2007-05-29 11:16:34 -04:00

islpci_eth.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

islpci_hotplug.c

PCI: add pci_try_set_mwi

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

islpci_mgt.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

islpci_mgt.h

[PATCH] prism54: whitespace cleanup

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

Makefile

Linux-2.6.12-rc2

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

oid_mgt.c

[PATCH] misc-wireless: Use ARRAY_SIZE macro when appropriate

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

oid_mgt.h

Linux-2.6.12-rc2

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

prismcompat.h

[PATCH] prism54: whitespace cleanup

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