diff options
| author | Linus Torvalds <[email protected]> | 2007-07-30 18:06:55 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-07-30 18:06:55 +0000 |
| commit | 9c837fb692b005203765d8a569a2fe43fdff9df1 (patch) | |
| tree | 914146eb36c92c929bf32af69052e7d9fa28beb1 /net/ipv4/tcp_input.c | |
| parent | APM support depends on CONFIG_PM_SLEEP (diff) | |
| parent | [SPARC64]: Fix show_stack() when stack argument is NULL. (diff) | |
| download | kernel-9c837fb692b005203765d8a569a2fe43fdff9df1.tar.gz kernel-9c837fb692b005203765d8a569a2fe43fdff9df1.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix show_stack() when stack argument is NULL.
[SPARC]: Fix serial console node string creation.
[SPARC]: Mark SBUS framebuffer ioctls as IGNORE in compat_ioctl.c
[SPARC64]: asm-sparc64/floppy.h needs linux/pci.h
[SPARC64]: Fix conflicts in SBUS/PCI/EBUS/ISA DMA handling.
[VIDEO]: Fix OOPS in all SBUS framebuffer drivers.
[SPARC64]: Handle mostek clock type in mini_rtc driver.
[PARTITION]: Sun/Solaris VTOC table corrections
[SPARC]: Fix floppy on some sun4c systems.
[SPARC64]: Fix sun4u PCI config space accesses on sun4u.
[PARTITION] MSDOS: Fix Sun num_partitions handling.
[SPARC]: Update defconfig.
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions