forked from luck/tmp_suning_uos_patched
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) |
||
|---|---|---|
| .. | ||
| drivers | ||
| include | ||
| kernel | ||
| os-Linux | ||
| scripts | ||
| sys-i386 | ||
| sys-ia64 | ||
| sys-ppc | ||
| sys-x86_64 | ||
| .gitignore | ||
| defconfig | ||
| Kconfig.char | ||
| Kconfig.common | ||
| Kconfig.debug | ||
| Kconfig.net | ||
| Kconfig.rest | ||
| Kconfig.um | ||
| Kconfig.x86 | ||
| Makefile | ||
| Makefile-i386 | ||
| Makefile-ia64 | ||
| Makefile-os-Linux | ||
| Makefile-ppc | ||
| Makefile-skas | ||
| Makefile-x86_64 | ||