tree 86da1fe926fa6051201046f5d351f0b46aa101b3
parent 3653b9a8db41299a8735008026dad82035f8ca9b
parent 3298a7388c00227e736d1037328788073c80c7b4
author Linus Torvalds <torvalds@linux-foundation.org> 1229630446 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1229630446 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  bnx2: Fix bug in bnx2_free_rx_mem().
  irda: Add irda_skb_cb qdisc related padding
  jme: Fixed a typo
  net: kernel BUG at drivers/net/phy/mdio_bus.c:165!
  drivers/net: starfire: Fix napi ->poll() weight handling
  tlan: Fix pci memory unmapping
  enc28j60: use netif_rx_ni() to deliver RX packets
  tlan: Fix small (< 64 bytes) datagram transmissions
  netfilter: ctnetlink: fix missing CTA_NAT_SEQ_UNSPEC