From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 16 Sep 2007 00:35:57 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: Ubuntu-5.0.0-8.9~39803
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d0174640eedc1cd756754f03afe2dbb3d56de74e;p=mirror_ubuntu-disco-kernel.git

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:
  drivers/net/pcmcia/3c589_cs: fix port configuration switcheroo
  sk98lin: resurrect driver
  ucc_geth: fix compilation
  mv643xx_eth: Fix tx_bytes stats calculation
  As struct iw_point is bi-directional payload, we should copy back the content
  [PATCH] bcm43xx: Fix cancellation of work queue crashes
  spidernet: fix interrupt reason recognition
  ehea: fix last_rx update
  ehea: propagate physical port state
  Fix a lock problem in generic phy code
  sky2: restore multicast list on resume and other ops
  atl1: disable broken 64-bit DMA
---

d0174640eedc1cd756754f03afe2dbb3d56de74e