tree 57d9911c28da12b05bc78a2f53dab349479fe37b
parent bb8bd3a52a5dbca8bea31bfc72dacfb384170e69
parent fadacb1b80e35e0b36a90d43e21ef91eec4b889b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1189902957 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1189902957 -0700

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