diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 18:54:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 18:54:48 -0700 |
| commit | bf603625660b1742004bf86432ce3c210d14d4fd (patch) | |
| tree | db327975e92e01f2f2badb8ec5ae55282f156674 /arch/i386/kernel/setup.c | |
| parent | fbe96f92b3d9450e77a3a4bb1d46aa1bb908c1ab (diff) | |
| parent | 6656e3c4c8e0c80f2d2bfece574876d269f64861 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[ATM]: [lec] use refcnt to protect lec_arp_entries outside lock
[ATM]: [lec] add reference counting to lec_arp entries
[ATM]: [lec] use work queue instead of timer for lec arp expiry
[ATM]: [lec] old_close is no longer used
[ATM]: [lec] convert lec_arp_table to hlist
[ATM]: [lec] header indent, comment and whitespace cleanup
[ATM]: [lec] indent, comment and whitespace cleanup [continued]
[ATM]: [lec] indent, comment and whitespace cleanup
[SCTP]: Do not timestamp every SCTP packet.
[SCTP]: Use correct mask when disabling PMTUD.
[SCTP]: Include sk_buff overhead while updating the peer's receive window.
[SCTP]: Enable Nagle algorithm by default.
[BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present.
[NetLabel]: audit fixups due to delayed feedback
Diffstat (limited to 'arch/i386/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions