diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 10:14:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 10:14:29 -0800 |
| commit | d7f786e06538081dd10c97931a89418699fe609d (patch) | |
| tree | 750c6b313711c9df5d6a12197587e0372764df13 /net/ipv4/tcp_diag.c | |
| parent | e5717c48ed52feebd59756578debd34eaeb9d262 (diff) | |
| parent | f00a3ec4d47b51c5995fe10f8252a90aca331e62 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012]
[MIPS] Drop __init from init_8259A()
[MIPS] Fix Kconfig typo bug
[MIPS] Fix double signal on trap and break instruction
[MIPS] sigset_32 has been made redundand by compat_sigset_t.
[MIPS] emma2rh: Remove needless <asm/i8259.h> inclusion.
[MIPS] Add MTD device support for Cobalt
Diffstat (limited to 'net/ipv4/tcp_diag.c')
0 files changed, 0 insertions, 0 deletions