]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:01:37 +0000 (16:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:01:37 +0000 (16:01 -0700)
commit764527a1b3294b4560203979f39a3671b9a26676
treee1894879eeb5a5d513f09dab4e7276aa73676783
parent45e9c0de2e86485f8b6633fd64ab19cfbff167f6
parente7272403d2f9be3dbb7cc185fcc390e781b1af6b
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