From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 15 Jul 2006 04:57:06 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.18-rc2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=76aba64a6608fcaa02c715e93c572192f3621195;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:
  [VLAN]: __vlan_hwaccel_rx can use the faster ether_compare_addr
  [PKT_SCHED] HTB: initialize upper bound properly
  [IPV4]: Clear skb cb on IP input
  [NET]: Update frag_list in pskb_trim
---

76aba64a6608fcaa02c715e93c572192f3621195