tree 134501057a244b8ae18b87647a7574e4a36e4b5b
parent 943547abdfe9b4e27e36a25987909619908dffbf
parent 6f4a7f4183bdbd02741dcd8edbd10b8628acc5d5
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1196799671 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1196799671 -0800

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

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  PHY: Add the phy_device_release device method.
  gianfar: fix compile warning
  pasemi_mac: Fix reuse of free'd skb
  SMC911X: Fix using of dereferenced skb after netif_rx
  sky2: recovery deadlock fix
  Fix memory corruption in fec_mpc52xx
  Don't claim to do IPv6 checksum offload
  cxgb - revert file mode changes.