diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 02:40:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 02:40:16 +0200 |
| commit | 1ff8419871ea757ae0298aa296bcff9b2ca48561 (patch) | |
| tree | ff2194bc75f06107e16220ce303ef546f9a4c769 /include/asm-x86/cpufeature.h | |
| parent | MFD_TC6393XB is ARM-only (diff) | |
| parent | ipsec: ipcomp - Decompress into frags if necessary (diff) | |
| download | linux-1ff8419871ea757ae0298aa296bcff9b2ca48561.tar.xz linux-1ff8419871ea757ae0298aa296bcff9b2ca48561.zip | |
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()
Diffstat (limited to 'include/asm-x86/cpufeature.h')
0 files changed, 0 insertions, 0 deletions