diff options
| author | Linus Torvalds <[email protected]> | 2007-04-21 05:58:16 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-04-21 05:58:16 +0000 |
| commit | 0f851021c0f91e5073fa89f26b5ac68e23df8e11 (patch) | |
| tree | 23c3e56c76361386c56ddf4ffcecad17bd8c004d /net/ipv4/tcp_input.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | ide/Kconfig: add missing range check for IDE_MAX_HWIFS (diff) | |
| download | kernel-0f851021c0f91e5073fa89f26b5ac68e23df8e11.tar.gz kernel-0f851021c0f91e5073fa89f26b5ac68e23df8e11.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide/Kconfig: add missing range check for IDE_MAX_HWIFS
hpt366: fix kernel oops with HPT302N
ide/pci/delkin_cb.c: add new PCI ID
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions