| commit | 3ee783a3e4867ce5691bfa6a818959e88a50f209 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Nov 08 07:34:11 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Nov 08 07:34:11 2006 -0800 |
| tree | 4263289a5f8551500c0c66bbb0c7ab01a4e8e075 | |
| parent | 80c218812786f619c9a1ce50d0e7c32c7afde4de [diff] | |
| parent | 375d9d71838970030c8e0bf0ac2abcc1a3487df8 [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: [DECNET]: Endianess fixes (try #2) [TG3]: Fix array overrun in tg3_read_partno(). [NET]: Set truesize in pskb_copy [NETPOLL]: Compute checksum properly in netpoll_send_udp(). [PKT_SCHED] sch_htb: Use hlist_del_init(). [TCP]: Don't use highmem in tcp hash size calculation. [NET]: kconfig, correct traffic shaper