]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Dec 2008 20:00:46 +0000 (12:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Dec 2008 20:00:46 +0000 (12:00 -0800)
commit0ed2f931c924932c3382d8733e1226b3ef83eae5
tree86da1fe926fa6051201046f5d351f0b46aa101b3
parent38ba3cfa7437620fec929439a0a4d34c5ba124d6
parent7cf22959cd8c7b1c4d4600267b1f794b85d4ed8c
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