]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Jul 2006 04:57:06 +0000 (21:57 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Jul 2006 04:57:06 +0000 (21:57 -0700)
commit7f0f307d48a8af253dc39e35fe21ab3fb24732d6
tree9a4fd0b0afa3c71e0fee04710b55e19ebafb7924
parentbc146ff5e0c92711b5efb644b57f45dd4ea168f8
parent88c561cf08f7647352312632bef5e50b03cc9e2a
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