From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 15 Apr 2006 00:10:20 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc2~28
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b627d173e0e1014298b92311f869eed53963bf3;p=linux-2.6

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: (170 commits)
  commit 3d9dd7564d5d7c28eb87b14c13a23806484667f3
  Author: Zach Brown <zach.brown@oracle.com>
  Date:   Fri Apr 14 16:04:18 2006 -0700

      [PATCH] ip_output: account for fraggap when checking to add trailer_len

      During other work I noticed that ip_append_data() seemed to be forgetting to
      include the frag gap in its calculation of a fragment that consumes the rest of
      the payload.  Herbert confirmed that this was a bug that snuck in during a
      previous rework.

      Signed-off-by: Zach Brown <zach.brown@oracle.com>
      Signed-off-by: David S. Miller <davem@davemloft.net>

  commit 08d099974a09faf4cb11ffc46da87073fa132fc0
  Author: Linus Walleij <triad@df.lth.se>
  Date:   Fri Apr 14 16:03:33 2006 -0700

      [IRDA]: smsc-ircc2, smcinit support for ALi ISA bridges

  ...
---

1b627d173e0e1014298b92311f869eed53963bf3