]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jul 2008 00:40:16 +0000 (17:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jul 2008 00:40:16 +0000 (17:40 -0700)
commit8293a1251d5999924b079153d622ba5c4416851f
treeff2194bc75f06107e16220ce303ef546f9a4c769
parentf2c76a79035bd965fdd706a6abca645fe98e9b92
parentda9408c856d459c2ea3ec902ac8a954bc0ce35bf
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ipsec: ipcomp - Decompress into frags if necessary
  ipsec: ipcomp - Merge IPComp implementations
  pkt_sched: Fix locking in shutdown_scheduler_queue()