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: (49 commits)
  [SCTP]: Set assoc_id correctly during INIT collision.
  [SCTP]: Re-order SCTP initializations to avoid race with sctp_rcv()
  [SCTP]: Fix the SO_REUSEADDR handling to be similar to TCP.
  [SCTP]: Verify all destination ports in sctp_connectx.
  [XFRM] SPD info TLV aggregation
  [XFRM] SAD info TLV aggregationx
  [AF_RXRPC]: Sort out MTU handling.
  [AF_IUCV/IUCV] : Add missing section annotations
  [AF_IUCV]: Implementation of a skb backlog queue
  [NETLINK]: Remove bogus BUG_ON
  [IPV6]: Some cleanups in include/net/ipv6.h
  [TCP]: zero out rx_opt in tcp_disconnect()
  [BNX2]: Fix TSO problem with small MSS.
  [NET]: Rework dev_base via list_head (v3)
  [TCP] Highspeed: Limited slow-start is nowadays in tcp_slow_start
  [BNX2]: Update version and reldate.
  [BNX2]: Print bus information for PCIE devices.
  [BNX2]: Add 1-shot MSI handler for 5709.
  [BNX2]: Restructure PHY event handling.
  [BNX2]: Add indirect spinlock.
  ...

diff --combined include/linux/pci_ids.h
index 5a48e963d06b5bf8b0d9046da97193ba5c983886,840a7e543c705d4d48c37de59c8e0bf997ef2e87..ae849f0d443058b1a094d434b26ab9df80b4540f
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1213,13 -1213,11 +1213,13 @@@
  #define PCI_DEVICE_ID_NVIDIA_NVENET_16              0x03E5
  #define PCI_DEVICE_ID_NVIDIA_NVENET_17              0x03E6
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA      0x03E7
 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SMBUS           0x03EB
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE       0x03EC
  #define PCI_DEVICE_ID_NVIDIA_NVENET_18              0x03EE
  #define PCI_DEVICE_ID_NVIDIA_NVENET_19              0x03EF
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2     0x03F6
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3     0x03F7
 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_SMBUS           0x0446
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE     0x0448
  #define PCI_DEVICE_ID_NVIDIA_NVENET_20              0x0450
  #define PCI_DEVICE_ID_NVIDIA_NVENET_21              0x0451
@@@ -1926,6 -1924,7 +1926,7 @@@
  #define PCI_DEVICE_ID_TIGON3_5752     0x1600
  #define PCI_DEVICE_ID_TIGON3_5752M    0x1601
  #define PCI_DEVICE_ID_NX2_5709                0x1639
+ #define PCI_DEVICE_ID_NX2_5709S               0x163a
  #define PCI_DEVICE_ID_TIGON3_5700     0x1644
  #define PCI_DEVICE_ID_TIGON3_5701     0x1645
  #define PCI_DEVICE_ID_TIGON3_5702     0x1646