]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c56d446 be2e4d6)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 23 May 2006 17:40:19 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 23 May 2006 17:40:19 +0000 (10:40 -0700)
commit1fee8daaee633d020d8ceb6bb56e01e0d7e82856
treeae5e77ed14f6bd1d04f4e632a62c48e90a17ee40tree | snapshot
parentc56d4461312419112ed8595d0a3d4c5e399e9c3bcommit | diff
parentbe2e4d62fc88b07a86b20489f141bca5c9495a99commit | 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
Linux Kernel Source Tree.