| commit | 76aba64a6608fcaa02c715e93c572192f3621195 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 14 21:57:06 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 14 21:57:06 2006 -0700 |
| tree | 9a4fd0b0afa3c71e0fee04710b55e19ebafb7924 | |
| parent | 52393ccc0a53c130f31fbbdb8b40b2aadb55ee72 [diff] | |
| parent | 0610d11b53ad15200618e38e4511373e3ed09e8a [diff] |
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