]> err.no Git - linux-2.6/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)
commit1ff8419871ea757ae0298aa296bcff9b2ca48561
treeff2194bc75f06107e16220ce303ef546f9a4c769
parent8d25b36b77fe32c296ece83e94ca6ae4d17f3e25
parent7d7e5a60c62e88cb8782760bb6c4d3bd1577a6c6
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()