diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 08:35:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 08:35:37 -0700 |
| commit | 7421a10de7a525f67cc082fca7a91011d00eada4 (patch) | |
| tree | 6b4509858003c6cf140e223e1dcc4250def2c75c /net/ipv4/tcp_timer.c | |
| parent | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | x86: Use .cfi_sections for assembly code (diff) | |
| download | linux-dev-7421a10de7a525f67cc082fca7a91011d00eada4.tar.xz linux-dev-7421a10de7a525f67cc082fca7a91011d00eada4.zip | |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Use .cfi_sections for assembly code
x86-64: Reduce SMP locks table size
x86, asm: Introduce and use percpu_inc()
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions