tree 3d499436eef8fb5f9bceb668eb8338a0f135308c
parent c2b38989cf2b0c003a9cf57efc833ab16d33901e
parent 096a458c3a9c717563e98b0a2ce69821459a6660
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1180047257 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1180047257 -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:
  forcedeth: fix cpu irq mask
  chelsio parenthesis fix
  spidernet: skb used after netif_receive_skb
  meth driver renovation
  remove unnecessary dependency on VIA velocity config
  fix compiler warning in fixed.c
  asix.c - Add Belkin F5D5055 ids
  ucc_geth:trivial fix
  ucc_geth: Fix MODULE_DEVICE_TABLE() duplication
  [PATCH] drivers/net/wireless/libertas/rx.c: fix use-after-free
  [PATCH] drivers/net/wireless/libertas/fw.c: fix use-before-check
  [PATCH] libertas: skb dereferenced after netif_rx