]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3768d41 139bd89)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 May 2006 23:30:31 +0000 (16:30 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 May 2006 23:30:31 +0000 (16:30 -0700)
commitab4e3d27c3a3a646e2962f7c3cd4e6e7c12592e7
tree7d8740ed7849d31eaea19e696a4ea098ba151a96tree | snapshot
parent3768d41613f8879405f29afecf3151bb45873a86commit | diff
parent139bd89688db64ce7b0c95a66afefb57e48f452acommit | 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:
  [TCP]: reno sacked_out count fix
  [IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match().
  [TR]: Remove an unused export.
  [IPX]: Correct return type of ipx_map_frame_type().
  [IPX]: Correct argument type of ipxrtr_delete().
  [PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog().
Linux Kernel Source Tree.