summary refs log tree commit diff
path: root/drivers/net/pasemi_mac_ethtool.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-18 12:00:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-18 12:00:46 -0800
commitb3806c3b940540ba9386a334ff0cc2597a5af60e (patch)
tree86da1fe926fa6051201046f5d351f0b46aa101b3 /drivers/net/pasemi_mac_ethtool.c
parent3653b9a8db41299a8735008026dad82035f8ca9b (diff)
parent3298a7388c00227e736d1037328788073c80c7b4 (diff)
downloadlinux-b3806c3b940540ba9386a334ff0cc2597a5af60e.tar.gz
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
Diffstat (limited to 'drivers/net/pasemi_mac_ethtool.c')
0 files changed, 0 insertions, 0 deletions