From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 23 May 2006 17:40:19 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc5~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9cfe864842c755ea6dd683e2449016c7c4ca9867;p=~shefty%2Frdma-dev.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER]: SNMP NAT: fix memory corruption
  [IRDA]: fixup type of ->lsap_state
  [IRDA]: fix 16/32 bit confusion
  [NET]: Fix "ntohl(ntohs" bugs
  [BNX2]: Use kmalloc instead of array
  [BNX2]: Fix bug in bnx2_nvram_write()
  [TG3]: Add some missing rx error counters
---

9cfe864842c755ea6dd683e2449016c7c4ca9867