diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:01:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:01:37 -0700 |
| commit | 764527a1b3294b4560203979f39a3671b9a26676 (patch) | |
| tree | e1894879eeb5a5d513f09dab4e7276aa73676783 /net/rxrpc | |
| parent | 45e9c0de2e86485f8b6633fd64ab19cfbff167f6 (diff) | |
| parent | e7272403d2f9be3dbb7cc185fcc390e781b1af6b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
e100: Use pci_pme_active to clear PME_Status and disable PME#
e1000: prevent corruption of EEPROM/NVM
forcedeth: call restore mac addr in nv_shutdown path
bnx2: Promote vector field in bnx2_irq structure from u16 to unsigned int
sctp: Fix oops when INIT-ACK indicates that peer doesn't support AUTH
sctp: do not enable peer features if we can't do them.
sctp: set the skb->ip_summed correctly when sending over loopback.
udp: Fix rcv socket locking
Diffstat (limited to 'net/rxrpc')
0 files changed, 0 insertions, 0 deletions