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

* '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
  ...

diff --cc drivers/net/8139cp.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/atl1/atl1.h
index df4c1a0071aa37a141d3018e80198c1d13e5880e,991c8b93d3862886f50e01a573500e917f5ad2bb..ff4765f6c3de632335d8f4e01011aaaf78279377
--- 1/drivers/net/atl1/atl1.h
--- 2/drivers/net/atl1/atl1.h
+++ b/drivers/net/atl1/atl1.h
@@@ -199,17 -226,11 +226,10 @@@ struct atl1_hw 
        u16 mii_autoneg_adv_reg;
        u16 mii_1000t_ctrl_reg;
  
-       u32 mem_rang;
-       u32 txcw;
        u32 max_frame_size;
        u32 min_frame_size;
-       u32 mc_filter_type;
-       u32 num_mc_addrs;
-       u32 collision_delta;
-       u32 tx_packet_delta;
-       u16 phy_spd_default;
  
        u16 dev_rev;
 -      u8 revision_id;
  
        /* spi flash */
        u8 flash_vendor;

diff --cc drivers/net/atl1/atl1_main.c
Simple merge

diff --cc drivers/net/forcedeth.c
Simple merge

diff --cc drivers/net/s2io.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_usb.c
Simple merge