Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit76aba64a6608fcaa02c715e93c572192f3621195
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Jul 2006 04:57:06 +0000 (14 21:57 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Jul 2006 04:57:06 +0000 (14 21:57 -0700)
tree9a4fd0b0afa3c71e0fee04710b55e19ebafb7924
parent52393ccc0a53c130f31fbbdb8b40b2aadb55ee72
parent0610d11b53ad15200618e38e4511373e3ed09e8a
Merge /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