projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fd0ff8a
f41d5bb
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 23 May 2006 17:40:19 +0000
(10:40 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 23 May 2006 17:40:19 +0000
(10:40 -0700)
* 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
Trivial merge