diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:47:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:47:22 -0700 |
| commit | 167b7129042a4b4c09bb4ede5482ff79340a3999 (patch) | |
| tree | f47e59a99feaa32a625fb0e720c9914d2e364444 /net/ipv4/tcp_timer.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | x86, smpboot: Fix cores per node printing on boot (diff) | |
| download | linux-dev-167b7129042a4b4c09bb4ede5482ff79340a3999.tar.xz linux-dev-167b7129042a4b4c09bb4ede5482ff79340a3999.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, smpboot: Fix cores per node printing on boot
x86/amd-iommu: Fall back to GART if initialization fails
x86/amd-iommu: Fix crash when request_mem_region fails
x86/mm: Remove unused DBG() macro
arch/x86/kernel: Add missing spin_unlock
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions