| commit | 9cfe864842c755ea6dd683e2449016c7c4ca9867 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue May 23 10:40:19 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue May 23 10:40:19 2006 -0700 |
| tree | ae5e77ed14f6bd1d04f4e632a62c48e90a17ee40 | |
| parent | fd0ff8aa1d95a896b3627bc62d42d6d002ac0bc3 [diff] | |
| parent | f41d5bb1d9f49b03af7126d07a511facbe283a92 [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: [NETFILTER]: SNMP NAT: fix memory corruption [IRDA]: fixup type of ->lsap_state [IRDA]: fix 16/32 bit confusion [NET]: Fix "ntohl(ntohs" bugs [BNX2]: Use kmalloc instead of array [BNX2]: Fix bug in bnx2_nvram_write() [TG3]: Add some missing rx error counters