| commit | 1ff8419871ea757ae0298aa296bcff9b2ca48561 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 25 17:40:16 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 25 17:40:16 2008 -0700 |
| tree | ff2194bc75f06107e16220ce303ef546f9a4c769 | |
| parent | 8d25b36b77fe32c296ece83e94ca6ae4d17f3e25 [diff] | |
| parent | 7d7e5a60c62e88cb8782760bb6c4d3bd1577a6c6 [diff] |
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()