2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
linux-next/drivers/net/phy
Linus Torvalds 6ba74014c1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* 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)
2010-08-04 11:47:58 -07:00
..
bcm63xx.c PHY: fix typo in bcm63xx PHY driver table 2010-04-13 03:29:36 -07:00
broadcom.c broadcom: Add 5241 support 2010-06-24 21:30:09 -07:00
cicada.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
davicom.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
et1011c.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
fixed.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
icplus.c phy: add suspend/resume in the ic+ 2010-07-20 13:24:25 -07:00
Kconfig drivers/net/phy: micrel phy driver 2010-05-03 15:43:26 -07:00
lxt.c phylib: Add autoload support for the LXT973 phy. 2010-06-26 22:12:03 -07:00
Makefile drivers/net/phy: micrel phy driver 2010-05-03 15:43:26 -07:00
marvell.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-08-04 11:47:58 -07:00
mdio_bus.c NET: Support clause 45 MDIO commands at the MDIO bus level 2010-03-16 21:23:42 -07:00
mdio-bitbang.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
mdio-gpio.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
mdio-octeon.c netdev: mdio-octeon: Fix section mismatch errors. 2010-06-28 23:58:54 -07:00
micrel.c micrel phy driver - updated(1) 2010-06-29 00:58:32 -07:00
national.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
phy_device.c net: support time stamping in phy devices. 2010-07-18 19:15:26 -07:00
phy.c net: support time stamping in phy devices. 2010-07-18 19:15:26 -07:00
qsemi.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
realtek.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
smsc.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
ste10Xp.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00
vitesse.c phylib: Add module table to all existing phy drivers 2010-04-02 14:30:40 -07:00