6ba74014c1
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits) phy/marvell: add 88ec048 support igb: Program MDICNFG register prior to PHY init e1000e: correct MAC-PHY interconnect register offset for 82579 hso: Add new product ID can: Add driver for esd CAN-USB/2 device l2tp: fix export of header file for userspace can-raw: Fix skb_orphan_try handling Revert "net: remove zap_completion_queue" net: cleanup inclusion phy/marvell: add 88e1121 interface mode support u32: negative offset fix net: Fix a typo from "dev" to "ndev" igb: Use irq_synchronize per vector when using MSI-X ixgbevf: fix null pointer dereference due to filter being set for VLAN 0 e1000e: Fix irq_synchronize in MSI-X case e1000e: register pm_qos request on hardware activation ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice net: Add getsockopt support for TCP thin-streams cxgb4: update driver version cxgb4: add new PCI IDs ... Manually fix up conflicts in: - drivers/net/e1000e/netdev.c: due to pm_qos registration infrastructure changes - drivers/net/phy/marvell.c: conflict between adding 88ec048 support and cleaning up the IDs - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req conflict (registration change vs marking it static)
/* ** HP VISUALIZE Workstation PCI Bus Defect ** ** "HP has discovered a potential system defect that can affect ** the behavior of five models of HP VISUALIZE workstations when ** equipped with third-party or customer-installed PCI I/O expansion ** cards. The defect is limited to the HP C180, C160, C160L, B160L, ** and B132L VISUALIZE workstations, and will only be encountered ** when data is transmitted through PCI I/O expansion cards on the ** PCI bus. HP-supplied graphics cards that utilize the PCI bus are ** not affected." ** ** REVISIT: "go/pci_defect" link below is stale. ** HP Internal can use <http://hpfcdma.fc.hp.com:80/Dino/> ** ** Product First Good Serial Number ** C200/C240 (US) US67350000 **B132L+/B180 (US) US67390000 ** C200 (Europe) 3713G01000 ** B180L (Europe) 3720G01000 ** ** Note that many boards were fixed/replaced under a free replacement ** program. Assume a machine is only "suspect" until proven otherwise. ** ** "The pci_check program will also be available as application ** patch PHSS_12295" */