From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 17 May 2006 23:30:31 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc5~104
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cb46c3701fb7b738de1e22ac4f2d06d18f547a74;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:
  [TCP]: reno sacked_out count fix
  [IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match().
  [TR]: Remove an unused export.
  [IPX]: Correct return type of ipx_map_frame_type().
  [IPX]: Correct argument type of ipxrtr_delete().
  [PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog().
---

cb46c3701fb7b738de1e22ac4f2d06d18f547a74